From 5f089cc0aaf8419be05dc4ef99c8f1194dfc68ff Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Sun, 6 Nov 2022 18:45:30 +0000 Subject: [PATCH 1/7] GNU libstdc++3 _GTHREAD_USE_MUTEX_TIMEDLOCK is not used post gcc-6. Fixes: https://github.com/boostorg/config/issues/399. --- include/boost/config/stdlib/libstdcpp3.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/config/stdlib/libstdcpp3.hpp b/include/boost/config/stdlib/libstdcpp3.hpp index 390205a7..85ad1a6b 100644 --- a/include/boost/config/stdlib/libstdcpp3.hpp +++ b/include/boost/config/stdlib/libstdcpp3.hpp @@ -459,7 +459,7 @@ extern "C" char *gets (char *__s); # endif #endif -#if (!defined(_GTHREAD_USE_MUTEX_TIMEDLOCK) || (_GTHREAD_USE_MUTEX_TIMEDLOCK == 0)) && !defined(BOOST_NO_CXX11_HDR_MUTEX) +#if (!defined(_GTHREAD_USE_MUTEX_TIMEDLOCK) || (_GTHREAD_USE_MUTEX_TIMEDLOCK == 0)) && !defined(BOOST_NO_CXX11_HDR_MUTEX) && (__GNUC__ < 6) // Timed mutexes are not always available: # define BOOST_NO_CXX11_HDR_MUTEX #endif From 704d2fa08daba2d5dd7662459b0c17fff8f9ae17 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Mon, 7 Nov 2022 13:21:10 +0000 Subject: [PATCH 2/7] Add MacOS GCC test runner. --- .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 6d84deb1..1c047b9d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,7 +151,7 @@ jobs: strategy: fail-fast: false matrix: - toolset: [ clang ] + toolset: [ clang gcc ] steps: - uses: actions/checkout@v2 with: From 3a54a8554af7b83efe8951d085939491d0f4b14c Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Mon, 7 Nov 2022 13:30:53 +0000 Subject: [PATCH 3/7] Correct CI script. --- .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 1c047b9d..6e3867cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,7 +151,7 @@ jobs: strategy: fail-fast: false matrix: - toolset: [ clang gcc ] + toolset: [ clang, gcc ] steps: - uses: actions/checkout@v2 with: From deed857d162bc143f1231440661e5b003ea94a38 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Mon, 7 Nov 2022 17:02:26 +0000 Subject: [PATCH 4/7] Try gcc-11. --- .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 6e3867cd..5eb0696e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,7 +151,7 @@ jobs: strategy: fail-fast: false matrix: - toolset: [ clang, gcc ] + toolset: [ clang, gcc-11 ] steps: - uses: actions/checkout@v2 with: From c468ec13e270576a0c41358b95c74462becc8377 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Mon, 7 Nov 2022 17:40:45 +0000 Subject: [PATCH 5/7] Add more MacOS runners. --- .github/workflows/ci.yml | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5eb0696e..f862a1b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,8 +146,43 @@ jobs: - name: Test run: ../../../b2 toolset=$TOOLSET cxxstd=03,11,14,17,2a working-directory: ../boost-root/libs/config/test - macos: - runs-on: macos-latest + macos_11: + runs-on: macos-11 + strategy: + fail-fast: false + matrix: + toolset: [ clang, gcc-11, gcc-10, gcc-9 ] + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: '0' + - uses: mstachniuk/ci-skip@v1 + with: + commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[linux];[Linux];[LINUX]' + commit-filter-separator: ';' + fail-fast: true + - name: Checkout main boost + run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root + - name: Update Dependencies + run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits + working-directory: ../boost-root + - name: Copy files + run: cp -r $GITHUB_WORKSPACE/* libs/config + working-directory: ../boost-root + - name: Bootstrap + run: ./bootstrap.sh + working-directory: ../boost-root + - name: Generate headers + run: ./b2 headers + working-directory: ../boost-root + - name: Config info + run: ../../../b2 print_config_info toolset=${{ matrix.toolset }} cxxstd=03,11,14,17,2a + working-directory: ../boost-root/libs/config/test + - name: Test + run: ../../../b2 toolset=${{ matrix.toolset }} cxxstd=03,11,14,17,2a + working-directory: ../boost-root/libs/config/test + macos_12: + runs-on: macos-12 strategy: fail-fast: false matrix: From 1c37e0c38d55ae1a8906cfefdc38e22351c58a5d Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Tue, 8 Nov 2022 13:18:05 +0000 Subject: [PATCH 6/7] Back off gcc on MacOS 12 for now as there are inscrutable failures. --- .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 f862a1b5..deb59fbe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -186,7 +186,7 @@ jobs: strategy: fail-fast: false matrix: - toolset: [ clang, gcc-11 ] + toolset: [ clang ] steps: - uses: actions/checkout@v2 with: From 2c2cac226a39223a84108bff2269ffadf7470f73 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Tue, 8 Nov 2022 17:25:12 +0000 Subject: [PATCH 7/7] Update CI script version numbers. --- .github/workflows/ci.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index deb59fbe..75270fa0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: matrix: compiler: [ g++-11, g++-12, clang++-14 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: '0' - uses: mstachniuk/ci-skip@v1 @@ -65,7 +65,7 @@ jobs: matrix: compiler: [ clang++-11, clang++-12, clang++-13 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: '0' - uses: mstachniuk/ci-skip@v1 @@ -109,7 +109,7 @@ jobs: matrix: compiler: [ g++-9, g++-10, clang++-9, clang++-10 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: '0' - uses: mstachniuk/ci-skip@v1 @@ -153,7 +153,7 @@ jobs: matrix: toolset: [ clang, gcc-11, gcc-10, gcc-9 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: '0' - uses: mstachniuk/ci-skip@v1 @@ -188,7 +188,7 @@ jobs: matrix: toolset: [ clang ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: '0' - uses: mstachniuk/ci-skip@v1 @@ -226,7 +226,7 @@ jobs: matrix: toolset: [ msvc-14.0 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: '0' - uses: mstachniuk/ci-skip@v1 @@ -264,7 +264,7 @@ jobs: matrix: toolset: [ msvc-14.2 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: '0' - uses: mstachniuk/ci-skip@v1 @@ -302,7 +302,7 @@ jobs: matrix: toolset: [ msvc-14.3 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: '0' - uses: mstachniuk/ci-skip@v1 @@ -340,7 +340,7 @@ jobs: matrix: toolset: [ clang-msvc-14.3 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: '0' - uses: mstachniuk/ci-skip@v1 @@ -375,8 +375,8 @@ jobs: matrix: qemu_arch: [ aarch64, s390x, ppc64le ] steps: - - uses: actions/checkout@v2.1.0 - - uses: uraimo/run-on-arch-action@v2.0.5 + - uses: actions/checkout@v3 + - uses: uraimo/run-on-arch-action@v2 name: Run commands id: runcmd with: @@ -411,8 +411,8 @@ jobs: matrix: qemu_arch: [ aarch64, ppc64le ] steps: - - uses: actions/checkout@v2.1.0 - - uses: uraimo/run-on-arch-action@v2.0.5 + - uses: actions/checkout@v3 + - uses: uraimo/run-on-arch-action@v2 name: Run commands id: runcmd with: @@ -448,7 +448,7 @@ jobs: matrix: compiler: [ emcc ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: '0' - uses: mstachniuk/ci-skip@v1 @@ -525,7 +525,7 @@ jobs: matrix: std: [ 11, 14, 17 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: '0' - uses: mstachniuk/ci-skip@v1