From d4f0e57b367632593c2695e8898fec384a32e584 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 21 Jul 2024 21:54:28 +0300 Subject: [PATCH 1/4] Update .drone.jsonnet --- .drone.jsonnet | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 9b8a5b3..df1f942 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -99,7 +99,7 @@ local windows_pipeline(name, image, environment, arch = "amd64") = linux_pipeline( "Linux 16.04 GCC 4.8 32/64", "cppalliance/droneubuntu1604:1", - { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11', ADDRMD: '32,64' }, + { TOOLSET: 'gcc', COMPILER: 'g++-4.8', CXXSTD: '11', ADDRMD: '32,64' }, "g++-4.8-multilib", ), @@ -177,44 +177,37 @@ local windows_pipeline(name, image, environment, arch = "amd64") = ), linux_pipeline( - "Linux 23.04 GCC 13 32 ASAN", + "Linux 23.04 GCC 13 32/64", "cppalliance/droneubuntu2304:1", - { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + asan, + { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32,64' }, "g++-13-multilib", ), linux_pipeline( - "Linux 23.04 GCC 13 64 ASAN", - "cppalliance/droneubuntu2304:1", - { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + asan, - "g++-13-multilib", - ), - - linux_pipeline( - "Linux 23.04 GCC 13 32 UBSAN", - "cppalliance/droneubuntu2304:1", - { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + ubsan, - "g++-13-multilib", + "Linux 24.04 GCC 14 32 ASAN", + "cppalliance/droneubuntu2404:1", + { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + asan, + "g++-14-multilib", ), linux_pipeline( - "Linux 23.04 GCC 13 64 UBSAN", - "cppalliance/droneubuntu2304:1", - { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + ubsan, - "g++-13-multilib", + "Linux 24.04 GCC 14 64 ASAN", + "cppalliance/droneubuntu2404:1", + { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + asan, + "g++-14-multilib", ), linux_pipeline( - "Linux 24.04 GCC 14 32", + "Linux 24.04 GCC 14 32 UBSAN", "cppalliance/droneubuntu2404:1", - { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' }, + { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + ubsan, "g++-14-multilib", ), linux_pipeline( - "Linux 24.04 GCC 14 64", + "Linux 24.04 GCC 14 64 UBSAN", "cppalliance/droneubuntu2404:1", - { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' }, + { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + ubsan, "g++-14-multilib", ), From e3cf721a23854ab4c227e30fded3b69949e3f6a8 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 21 Jul 2024 22:20:27 +0300 Subject: [PATCH 2/4] Define BOOST_ALLOW_DEPRECATED in JSON tests for g++ 4.x --- test/variant_json_value_from.cpp | 6 ++++++ test/variant_json_value_to.cpp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/test/variant_json_value_from.cpp b/test/variant_json_value_from.cpp index 9734c74..be5dc3a 100644 --- a/test/variant_json_value_from.cpp +++ b/test/variant_json_value_from.cpp @@ -2,6 +2,12 @@ // Distributed under the Boost Software License, Version 1.0. // https://www.boost.org/LICENSE_1_0.txt +#include + +#if defined(BOOST_GCC) && BOOST_GCC < 50000 +# define BOOST_ALLOW_DEPRECATED +#endif + #include #include #include diff --git a/test/variant_json_value_to.cpp b/test/variant_json_value_to.cpp index 1263931..5b42cc0 100644 --- a/test/variant_json_value_to.cpp +++ b/test/variant_json_value_to.cpp @@ -2,6 +2,12 @@ // Distributed under the Boost Software License, Version 1.0. // https://www.boost.org/LICENSE_1_0.txt +#include + +#if defined(BOOST_GCC) && BOOST_GCC < 50000 +# define BOOST_ALLOW_DEPRECATED +#endif + #include #include #include From 0e325dcf8d95088b80788d142fa19c061e7671a1 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 21 Jul 2024 22:38:06 +0300 Subject: [PATCH 3/4] Update ci.yml --- .github/workflows/ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e20d315..c7fc0ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -159,9 +159,6 @@ jobs: container: ubuntu:24.04 os: ubuntu-latest install: clang-18 - - toolset: clang - cxxstd: "11,14,17,2a" - os: macos-11 - toolset: clang cxxstd: "11,14,17,20,2b" os: macos-12 @@ -180,6 +177,10 @@ jobs: shell: bash steps: + - name: Enable Node 16 + run: | + echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV + - uses: actions/checkout@v3 - name: Setup container environment @@ -292,9 +293,9 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - os: macos-12 - os: macos-13 + - os: macos-14 runs-on: ${{matrix.os}} @@ -340,9 +341,9 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - os: macos-12 - os: macos-13 + - os: macos-14 runs-on: ${{matrix.os}} @@ -398,9 +399,9 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - os: macos-12 - os: macos-13 + - os: macos-14 runs-on: ${{matrix.os}} From f5cd36af3d47203038a6700f1163a554016ee0dc Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 21 Jul 2024 22:55:40 +0300 Subject: [PATCH 4/4] Update MSVC workaround --- include/boost/variant2/variant.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/variant2/variant.hpp b/include/boost/variant2/variant.hpp index 71f6eaa..3eb5342 100644 --- a/include/boost/variant2/variant.hpp +++ b/include/boost/variant2/variant.hpp @@ -83,7 +83,7 @@ struct monostate { }; -#if !BOOST_WORKAROUND(BOOST_MSVC, < 1940) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1950) constexpr bool operator<(monostate, monostate) noexcept { return false; } constexpr bool operator>(monostate, monostate) noexcept { return false; }