From 9f8ebdf8ce8e84a58f7faae9ebb0bb63d4b8876c Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Fri, 6 Dec 2024 16:39:33 +0100 Subject: [PATCH 1/4] Fix Github Actions --- .github/workflows/ci.yml | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04ce2b4f..c577017a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,5 @@ name: GitHub Actions CI -# permit node16 use as a workaround for node20's differing glibc version -env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true - on: pull_request: push: @@ -25,7 +21,7 @@ jobs: buildtype: "boost" packages: "" packages_to_remove: "" - os: "ubuntu-20.04" + os: ubuntu-latest container: "ubuntu:16.04" cxx: "g++" sources: "" @@ -37,7 +33,7 @@ jobs: buildtype: "boost" packages: "g++-5" packages_to_remove: "" - os: "ubuntu-20.04" + os: ubuntu-latest container: "ubuntu:16.04" cxx: "g++-5" sources: "" @@ -49,7 +45,7 @@ jobs: buildtype: "boost" packages: "g++-6" packages_to_remove: "" - os: "ubuntu-20.04" + os: ubuntu-latest container: "ubuntu:16.04" cxx: "g++-6" sources: "" @@ -61,7 +57,7 @@ jobs: buildtype: "boost" packages: "g++-7" packages_to_remove: "" - os: "ubuntu-20.04" + os: ubuntu-latest container: "ubuntu:16.04" cxx: "g++-7" sources: "" @@ -73,7 +69,7 @@ jobs: buildtype: "boost" packages: "g++-9" packages_to_remove: "" - os: "ubuntu-20.04" + os: ubuntu-latest container: "ubuntu:16.04" cxx: "g++-9" sources: "" @@ -94,9 +90,14 @@ jobs: cxxstd: "11,14,17,20" runs-on: ${{ matrix.os }} - container: ${{ matrix.container }} + container: + image: ${{matrix.container}} + volumes: + - /node20217:/node20217:rw,rshared + - ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }} steps: + - name: Check if running in container if: matrix.container != '' run: echo "GHA_CONTAINER=${{ matrix.container }}" >> $GITHUB_ENV @@ -110,8 +111,10 @@ jobs: sudo wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py sudo python3 get-pip.py sudo /usr/local/bin/pip install cmake + # Node 20 doesn't work with Ubuntu 16/18 glibc: https://github.com/actions/checkout/issues/1590 + curl -sL https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz | tar -xJ --strip-components 1 -C /node20217 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: linux shell: bash @@ -197,7 +200,7 @@ jobs: - name: "TOOLSET=clang CXXSTD=11,14,17,20 Job 5" buildtype: "boost" packages: "" - os: "macos-12" + os: "macos-13" cxx: "clang++" sources: "" llvm_os: "" @@ -209,7 +212,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set DEVELOPER_DIR if: matrix.xcode_version != '' From b45951ccb350704f0d6233fecb1498698327bd09 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Tue, 10 Dec 2024 09:57:13 +0100 Subject: [PATCH 2/4] Suppress unused parameter warnings --- include/boost/wave/cpplexer/cpp_lex_token.hpp | 4 ++-- include/boost/wave/grammars/cpp_grammar.hpp | 2 +- include/boost/wave/util/flex_string.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/wave/cpplexer/cpp_lex_token.hpp b/include/boost/wave/cpplexer/cpp_lex_token.hpp index 11269dbf..82d6c747 100644 --- a/include/boost/wave/cpplexer/cpp_lex_token.hpp +++ b/include/boost/wave/cpplexer/cpp_lex_token.hpp @@ -160,7 +160,7 @@ template inline void * token_data::operator new(std::size_t size) { - BOOST_ASSERT(sizeof(token_data) == size); + BOOST_VERIFY(sizeof(token_data) == size); typedef boost::singleton_pool< token_data_tag, sizeof(token_data) > pool_type; @@ -175,7 +175,7 @@ template inline void token_data::operator delete(void *p, std::size_t size) { - BOOST_ASSERT(sizeof(token_data) == size); + BOOST_VERIFY(sizeof(token_data) == size); typedef boost::singleton_pool< token_data_tag, sizeof(token_data) > pool_type; diff --git a/include/boost/wave/grammars/cpp_grammar.hpp b/include/boost/wave/grammars/cpp_grammar.hpp index e310d43a..2a3c17ea 100644 --- a/include/boost/wave/grammars/cpp_grammar.hpp +++ b/include/boost/wave/grammars/cpp_grammar.hpp @@ -729,7 +729,7 @@ boost::spirit::classic::tree_parse_info< > cpp_grammar_gen::parse_cpp_grammar ( LexIteratorT const &first, LexIteratorT const &last, - position_type const &act_pos, bool &found_eof, + position_type const &/* act_pos */, bool &found_eof, token_type &found_directive, token_container_type &found_eoltokens) { using namespace boost::spirit::classic; diff --git a/include/boost/wave/util/flex_string.hpp b/include/boost/wave/util/flex_string.hpp index a978f38b..79962dd7 100644 --- a/include/boost/wave/util/flex_string.hpp +++ b/include/boost/wave/util/flex_string.hpp @@ -1407,7 +1407,7 @@ class flex_string : private Storage #else template static inline void Enforce(bool condition, Exception*, const char* msg) - { BOOST_ASSERT(condition && msg); } + { BOOST_VERIFY(condition && msg); } #endif // defined(BOOST_WAVE_FLEXSTRING_THROW_ON_ENFORCE) #ifndef NDEBUG From 27392d2cc1800dec0d01dcb9a284c97cbabf566b Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Fri, 28 Feb 2025 23:23:36 +0300 Subject: [PATCH 3/4] Avoid including deprecated header. `boost/detail/atomic_count.hpp` was moved to `boost/smart_ptr/detail` and the old header is deprecated and emits warnings. --- samples/real_positions/real_position_token.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/real_positions/real_position_token.hpp b/samples/real_positions/real_position_token.hpp index a387a0df..6c3ac864 100644 --- a/samples/real_positions/real_position_token.hpp +++ b/samples/real_positions/real_position_token.hpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include /////////////////////////////////////////////////////////////////////////////// From c8fe261da8b3f1ee025083fe366e333a80df7bd5 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Fri, 25 Apr 2025 15:52:51 +0200 Subject: [PATCH 4/4] GHA: Use Ubuntu 24.04 for clang test GitHub removes the Ubuntu 20 runners As the Clang version doesn't seem to matter just update to the latest OS --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c577017a..7a3f1179 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: buildtype: "boost" packages: "" packages_to_remove: "" - os: "ubuntu-20.04" + os: "ubuntu-24.04" cxx: "clang++" sources: "" llvm_os: ""