Merge commit 'ecd1d07360734b1af76582118b002ca0c4448e07'

Merge commit 'df5e7995ad04c76f0f732fc4f644683759852e24'
Merge pull request #522 from anarthal/feature/ci-fixes
2026-03-07 14:24:10 +01:00 · 2025-10-09 16:06:50 +03:00 · 2025-10-09 16:03:26 +03:00 · 2025-09-20 12:43:54 +01:00 · 2025-09-20 12:18:09 +02:00 · 2025-09-19 16:45:52 +02:00
15 changed files with 30 additions and 151 deletions
--- a/.drone.star
+++ b/.drone.star
@@ -45,7 +45,7 @@ def main(ctx):
  linux_cxx("clang++-10 03,11,14,17,20", "clang++-10", packages="clang-10", llvm_os="xenial", llvm_ver="10", buildtype="boost", image="cppalliance/droneubuntu1804:1", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++-10', 'CXXSTD': '03,11,14,17,20', }, globalenv=globalenv),
  linux_cxx("clang++-11 03,11,14,17,20", "clang++-11", packages="clang-11", llvm_os="focal", llvm_ver="11", buildtype="boost", image="cppalliance/droneubuntu2004:1", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++-11', 'CXXSTD': '03,11,14,17,20', }, globalenv=globalenv),
  linux_cxx("clang++-12 03,11,14,17,20", "clang++-12", packages="clang-12", llvm_os="focal", llvm_ver="12", buildtype="boost", image="cppalliance/droneubuntu2004:1", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++-12', 'CXXSTD': '03,11,14,17,20', }, globalenv=globalenv),
-  linux_cxx("Ubuntu g++-13", packages="g++-13", buildtype="boost", image="cppalliance/droneubuntu2304:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-13', 'CXXSTD': '14,17,20,23', }, globalenv=globalenv),
+  linux_cxx("Ubuntu g++-13", packages="g++-13", buildtype="boost", image="cppalliance/droneubuntu2404:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-13', 'CXXSTD': '14,17,20,23', }, globalenv=globalenv),
  osx_cxx("XCode-11.7 03,11,17,2a", "clang++", packages="", buildtype="boost", xcode_version="11.7", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03,11,14,17,2a', }, globalenv=globalenv),
  osx_cxx("XCode-10.2 03,11,17,2a", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03,11,14,17,2a', }, globalenv=globalenv),
  ]
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,14 +21,9 @@ jobs:
      matrix:
        compiler: [ g++-13, g++-14 ]
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
        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];[apple];[Apple];[APPLE]'
-          commit-filter-separator: ';'
-          fail-fast: true
      - name: Set TOOLSET
        run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
      - name: Add repository
@@ -65,14 +60,9 @@ jobs:
      matrix:
        compiler: [ g++-11, g++-12, g++-13 ]
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
        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];[apple];[Apple];[APPLE]'
-          commit-filter-separator: ';'
-          fail-fast: true
      - name: Set TOOLSET
        run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
      - name: Add repository
@@ -109,14 +99,9 @@ jobs:
      matrix:
        compiler: [ clang++-15 ]
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
        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];[apple];[Apple];[APPLE]'
-          commit-filter-separator: ';'
-          fail-fast: true
      - name: Set TOOLSET
        run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
      - name: Add repository
@@ -153,14 +138,9 @@ jobs:
      matrix:
        toolset: [ clang ]
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
        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
@@ -181,82 +161,6 @@ jobs:
      - name: Test
        run: ../../../b2 toolset=${{ matrix.toolset }} cxxstd=03,11,14,17,2a
        working-directory: ../boost-root/libs/config/test
-  windows_msvc_14_0:
-    runs-on: windows-2019
-    defaults:
-      run:
-        shell: cmd
-    strategy:
-      fail-fast: false
-      matrix:
-        toolset: [ msvc-14.0 ]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: '0'
-      - uses: mstachniuk/ci-skip@v1
-        with:
-          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[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 libs/static_assert libs/throw_exception libs/preprocessor
-        working-directory: ../boost-root
-      - name: Copy files
-        run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\config
-        working-directory: ../boost-root
-      - name: Bootstrap
-        run: bootstrap
-        working-directory: ../boost-root
-      - name: Generate headers
-        run: b2 headers
-        working-directory: ../boost-root
-      - name: Config info
-        run: ..\..\..\b2 print_config_info cxxstd=14,latest address-model=64 toolset=msvc-14.0
-        working-directory: ../boost-root/libs/config/test
-      - name: Test
-        run: ..\..\..\b2 --hash address-model=64 cxxstd=14,latest toolset=msvc-14.0
-        working-directory: ../boost-root/libs/config/test
-  windows_msvc_14_2:
-    runs-on: windows-2019
-    defaults:
-      run:
-        shell: cmd
-    strategy:
-      fail-fast: false
-      matrix:
-        toolset: [ msvc-14.2 ]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: '0'
-      - uses: mstachniuk/ci-skip@v1
-        with:
-          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[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 libs/static_assert libs/throw_exception libs/preprocessor
-        working-directory: ../boost-root
-      - name: Copy files
-        run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\config
-        working-directory: ../boost-root
-      - name: Bootstrap
-        run: bootstrap
-        working-directory: ../boost-root
-      - name: Generate headers
-        run: b2 headers
-        working-directory: ../boost-root
-      - name: Config info
-        run: ..\..\..\b2 print_config_info cxxstd=14,17,20,latest address-model=64 toolset=msvc-14.2
-        working-directory: ../boost-root/libs/config/test
-      - name: Test
-        run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17,20,latest toolset=msvc-14.2
-        working-directory: ../boost-root/libs/config/test
  windows_msvc_14_3:
    runs-on: windows-2022
    defaults:
@@ -267,14 +171,9 @@ jobs:
      matrix:
        toolset: [ msvc-14.3 ]
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
        with:
          fetch-depth: '0'
-      - uses: mstachniuk/ci-skip@v1
-        with:
-          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[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
@@ -305,14 +204,9 @@ jobs:
      matrix:
        toolset: [ clang-msvc-14.3 ]
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
        with:
          fetch-depth: '0'
-      - uses: mstachniuk/ci-skip@v1
-        with:
-          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[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
@@ -340,7 +234,7 @@ jobs:
      matrix:
        qemu_arch: [ aarch64, s390x, ppc64le ]
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
      - uses: uraimo/run-on-arch-action@v3
        name: Run commands
        id: runcmd
@@ -376,7 +270,7 @@ jobs:
      matrix:
        qemu_arch: [ aarch64, ppc64le ]
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
      - uses: uraimo/run-on-arch-action@v3
        name: Run commands
        id: runcmd
@@ -413,14 +307,9 @@ jobs:
      matrix:
        compiler: [ emcc ]
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
        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];[apple];[Apple];[APPLE]'
-          commit-filter-separator: ';'
-          fail-fast: true
      - name: Install Emscripten
        run: |
         uname -a
@@ -476,10 +365,10 @@ jobs:
        run: |
         source ../emsdk/emsdk_env.sh
         emcc -pthread -s EXIT_RUNTIME=1 -s PTHREAD_POOL_SIZE=32 -I. -O3 -o config_info_pthread libs/config/test/config_info.cpp
-         node --experimental-wasm-threads config_info_pthread
+         node config_info_pthread
      - name: Test config_test (pthread)
        working-directory: ../boost-root
        run: |
         source ../emsdk/emsdk_env.sh
         emcc -pthread -s EXIT_RUNTIME=1 -s PTHREAD_POOL_SIZE=32 -s DISABLE_EXCEPTION_CATCHING=0 -I. -O3 -o config_test_pthread libs/config/test/config_test.cpp
-         node --experimental-wasm-threads config_test_pthread
+         node config_test_pthread
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,10 +30,13 @@ environment:
    - ARGS: --toolset=msvc-10.0 address-model=32
    - ARGS: --toolset=msvc-11.0 address-model=32
    - ARGS: --toolset=msvc-12.0 address-model=32
-    - ARGS: --toolset=msvc-14.0 address-model=32
    - ARGS: --toolset=msvc-12.0 address-model=64
+    - ARGS: --toolset=msvc-14.0 address-model=32
    - ARGS: --toolset=msvc-14.0 address-model=64
    - ARGS: --toolset=msvc-14.0 address-model=64 cxxflags=-std:c++latest
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ARGS: --toolset=msvc-14.2 address-model=32
+      CXXSTD: 14,17,20,latest
    - ARGS: --toolset=gcc address-model=64 
      CXXSTD: 03,11,14,1z
      PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
@@ -62,6 +65,9 @@ install:
  - git submodule update --init libs/core
  - git submodule update --init libs/assert
  - git submodule update --init libs/type_traits
+  - git submodule update --init libs/static_assert
+  - git submodule update --init libs/throw_exception
+  - git submodule update --init libs/preprocessor
  - bootstrap
  - b2 headers
  
--- a/checks/Jamfile.v2
+++ b/checks/Jamfile.v2
@@ -1,6 +1,6 @@
 #
 # *** DO NOT EDIT THIS FILE BY HAND ***
-# This file was automatically generated on Mon Jan 22 16:16:53 2024
+# This file was automatically generated on Fri Oct 13 19:09:38 2023
 #  by libs/config/tools/generate.cpp
 # Copyright John Maddock.
 # Use, modification and distribution are subject to the 
--- a/checks/test_case.cpp
+++ b/checks/test_case.cpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Mon Jan 22 16:16:53 2024
+//  This file was automatically generated on Fri Oct 13 19:09:38 2023
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
--- a/include/boost/config/assert_cxx03.hpp
+++ b/include/boost/config/assert_cxx03.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Mon Jan 22 16:16:53 2024
+//  This file was automatically generated on Fri Oct 13 19:09:38 2023
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
--- a/include/boost/config/assert_cxx11.hpp
+++ b/include/boost/config/assert_cxx11.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Mon Jan 22 16:16:53 2024
+//  This file was automatically generated on Fri Oct 13 19:09:38 2023
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
--- a/include/boost/config/assert_cxx14.hpp
+++ b/include/boost/config/assert_cxx14.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Mon Jan 22 16:16:53 2024
+//  This file was automatically generated on Fri Oct 13 19:09:38 2023
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
--- a/include/boost/config/assert_cxx17.hpp
+++ b/include/boost/config/assert_cxx17.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Mon Jan 22 16:16:53 2024
+//  This file was automatically generated on Fri Oct 13 19:09:38 2023
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
--- a/include/boost/config/assert_cxx20.hpp
+++ b/include/boost/config/assert_cxx20.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Mon Jan 22 16:16:53 2024
+//  This file was automatically generated on Fri Oct 13 19:09:38 2023
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
--- a/include/boost/config/assert_cxx23.hpp
+++ b/include/boost/config/assert_cxx23.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Mon Jan 22 16:16:53 2024
+//  This file was automatically generated on Fri Oct 13 19:09:38 2023
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
--- a/include/boost/config/detail/cxx_composite.hpp
+++ b/include/boost/config/detail/cxx_composite.hpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Mon Jan 22 16:16:53 2024
+//  This file was automatically generated on Fri Oct 13 19:09:38 2023
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the 
--- a/test/all/Jamfile.v2
+++ b/test/all/Jamfile.v2
@@ -1,7 +1,7 @@
 #
 # Regression test Jamfile for boost configuration setup.
 # *** DO NOT EDIT THIS FILE BY HAND ***
-# This file was automatically generated on Mon Jan 22 16:16:53 2024
+# This file was automatically generated on Fri Oct 13 19:09:38 2023
 #  by libs/config/tools/generate.cpp
 # Copyright John Maddock.
 # Use, modification and distribution are subject to the 
--- a/test/config_info.cpp
+++ b/test/config_info.cpp
@@ -1273,22 +1273,6 @@ void print_boost_macros()
   PRINT_MACRO(BOOST_NO_VOID_RETURNS);


-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
   // END GENERATED BLOCK

   PRINT_MACRO(BOOST_CXX_VERSION);
--- a/test/config_test.cpp
+++ b/test/config_test.cpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Mon Jan 22 16:16:53 2024
+//  This file was automatically generated on Fri Oct 13 19:09:38 2023
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-21.
 //  Use, modification and distribution are subject to the
Author	SHA1	Message	Date
Peter Dimov	a7d5a9b05d	Merge commit 'ecd1d07360734b1af76582118b002ca0c4448e07'	2025-10-09 16:06:50 +03:00
Peter Dimov	1cab095b32	Merge commit 'df5e7995ad04c76f0f732fc4f644683759852e24'	2025-10-09 16:03:26 +03:00
jzmaddock	ecd1d07360	Merge pull request #522 from anarthal/feature/ci-fixes Fixes CI errors in GHA, Appveyor and Drone	2025-09-20 12:43:54 +01:00
Ruben Perez	b713cfaeee	Remove msvc 14.1 from appveyor	2025-09-20 12:18:09 +02:00
Ruben Perez	e994d4cac3	Update Drone image	2025-09-19 16:45:52 +02:00
Ruben Perez	378f2db5ae	Remove unsupported --experimental-wasm-threads	2025-09-19 13:52:04 +02:00
Ruben Perez	45fa9fe5f1	Remove unnecessary skip CI action	2025-09-19 13:44:30 +02:00
Ruben Perez	ef3bc7513d	Update actions/checkout to v5	2025-09-19 13:42:01 +02:00
Ruben Perez	15320cb338	Remove obsolete Windows builds from actions	2025-09-19 13:40:13 +02:00
Ruben Perez	07fb4bda0e	Missing dependencies in appveyor	2025-09-19 13:39:22 +02:00
Ruben Perez	f0aa2f0012	MSVC versions to appveyor	2025-09-19 13:38:35 +02:00
Ruben Perez	f3ad56d7cb	Missing static_assert dependency in appveyor	2025-09-19 13:31:12 +02:00
John Maddock	bf8c8bd796	Merge branch 'develop'	2025-07-04 20:36:11 +01:00
Glen Fernandes	e6a189394d	Update version.hpp	2025-06-27 23:15:58 -04:00
John Maddock	d34312c089	Merge branch 'develop'	2025-04-15 18:31:09 +01:00
Glen Fernandes	4e9d5a3a95	Merge branch 'develop'	2024-12-16 05:26:27 -05:00
Glen Fernandes	5e98c6ddd4	Merge pull request #502 from boostorg/develop Merge develop to master	2024-08-16 20:00:34 -04:00
Glen Fernandes	2bd6f0dfc5	Merge branch 'develop'	2024-04-18 08:20:52 -04:00
jzmaddock	11385ec210	Merge branch 'develop'	2024-02-04 09:46:22 +00:00
Marshall Clow	eef05e9813	Update version.hpp to 1.85.0	2023-12-19 12:49:14 +02:00
jzmaddock	cbeca533d2	Merge for 1 84 (#490 ) * Update cxxstd values for GHA msvc jobs * Add msvc support for [[maybe_unused]] attribute. Fixes: https://github.com/boostorg/serialization/issues/271 Also removes failing cuda+clang test as it's an inscrutable system setup issue. * Add C++23 header macros. * Minor corrections. * Remove XCode-9.4 testing as it appears to be no longer supported. * Update docs for C++23 macros. [CI SKIP] * Add C++23 feature test macro support. * Use __apple_build_version__ to detect Apple clang …since __APPLE__ is defined by both Apple Clang and LLVM.org Clang on Apple platforms. * Update BOOST_CLANG_VERSION for Xcode 14.3, 15.0, 15.1 * Update CI clang version now that gcc has changed. (#489) --------- Co-authored-by: Peter Dimov <pdimov@gmail.com> Co-authored-by: Christopher Chavez <chrischavez@gmx.us>	2023-11-04 09:27:38 +00:00