From 41f91c2e5ed19de24ca407db4cebf1d02b723f1c Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Fri, 16 Jan 2026 19:40:37 +0200 Subject: [PATCH 1/4] Update ci.yml --- .github/workflows/ci.yml | 146 +++++++++++++++++++++++---------------- 1 file changed, 87 insertions(+), 59 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92d8c80..1bf496a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,37 +43,43 @@ jobs: address-model: 32,64 - toolset: gcc-7 cxxstd: "11,14,17" - os: ubuntu-20.04 + container: ubuntu:20.04 + os: ubuntu-latest install: g++-7-multilib address-model: 32,64 - toolset: gcc-8 cxxstd: "11,14,17,2a" - os: ubuntu-20.04 + container: ubuntu:20.04 + os: ubuntu-latest install: g++-8-multilib address-model: 32,64 - toolset: gcc-9 cxxstd: "11,14,17,2a" - os: ubuntu-20.04 + container: ubuntu:20.04 + os: ubuntu-latest install: g++-9-multilib address-model: 32,64 - toolset: gcc-10 cxxstd: "11,14,17,2a" - os: ubuntu-20.04 + container: ubuntu:20.04 + os: ubuntu-latest install: g++-10-multilib address-model: 32,64 - toolset: gcc-11 cxxstd: "11,14,17,20,2b" - os: ubuntu-22.04 + container: ubuntu:22.04 + os: ubuntu-latest install: g++-11-multilib address-model: 32,64 - toolset: gcc-12 cxxstd: "11,14,17,20,2b" - os: ubuntu-22.04 + container: ubuntu:22.04 + os: ubuntu-latest install: g++-12-multilib address-model: 32,64 - toolset: gcc-13 cxxstd: "11,14,17,20,2b" - container: ubuntu:23.04 + container: ubuntu:24.04 os: ubuntu-latest install: g++-13-multilib address-model: 32,64 @@ -83,6 +89,12 @@ jobs: os: ubuntu-latest install: g++-14-multilib address-model: 32,64 + - toolset: gcc-15 + cxxstd: "11,14,17,20,23,2c" + container: ubuntu:25.10 + os: ubuntu-latest + install: g++-15-multilib + address-model: 32,64 - toolset: clang compiler: clang++-3.9 cxxstd: "11,14" @@ -104,35 +116,45 @@ jobs: - toolset: clang compiler: clang++-6.0 cxxstd: "11,14,17" - os: ubuntu-20.04 + container: ubuntu:20.04 + os: ubuntu-latest install: clang-6.0 - toolset: clang compiler: clang++-7 cxxstd: "11,14,17" - os: ubuntu-20.04 + container: ubuntu:20.04 + os: ubuntu-latest install: clang-7 - toolset: clang compiler: clang++-8 cxxstd: "11,14,17" - os: ubuntu-20.04 + container: ubuntu:20.04 + os: ubuntu-latest install: clang-8 - toolset: clang compiler: clang++-9 cxxstd: "11,14,17" - os: ubuntu-20.04 + container: ubuntu:20.04 + os: ubuntu-latest install: clang-9 - toolset: clang compiler: clang++-10 cxxstd: "11,14,17,2a" - os: ubuntu-20.04 + container: ubuntu:20.04 + os: ubuntu-latest + install: clang-10 - toolset: clang compiler: clang++-11 cxxstd: "11,14,17,2a" - os: ubuntu-20.04 + container: ubuntu:20.04 + os: ubuntu-latest + install: clang-11 - toolset: clang compiler: clang++-12 cxxstd: "11,14,17,20" - os: ubuntu-20.04 + container: ubuntu:20.04 + os: ubuntu-latest + install: clang-12 - toolset: clang compiler: clang++-13 cxxstd: "11,14,17,20" @@ -154,13 +176,13 @@ jobs: - toolset: clang compiler: clang++-16 cxxstd: "11,14,17,20,2b" - container: ubuntu:23.04 + container: ubuntu:24.04 os: ubuntu-latest install: clang-16 - toolset: clang compiler: clang++-17 cxxstd: "11,14,17,20,2b" - container: ubuntu:23.10 + container: ubuntu:24.04 os: ubuntu-latest install: clang-17 - toolset: clang @@ -170,34 +192,60 @@ jobs: os: ubuntu-latest install: clang-18 - toolset: clang + compiler: clang++-19 cxxstd: "11,14,17,20,2b" - os: macos-12 + container: ubuntu:24.04 + os: ubuntu-latest + install: clang-19 - toolset: clang - cxxstd: "11,14,17,20,2b" - os: macos-13 + compiler: clang++-20 + cxxstd: "11,14,17,20,23,2c" + container: ubuntu:24.04 + os: ubuntu-latest + install: clang-20 + - toolset: clang + compiler: clang++-21 + cxxstd: "11,14,17,20,23,2c" + container: ubuntu:25.10 + os: ubuntu-latest + install: clang-21 - toolset: clang - cxxstd: "11,14,17,20,2b" os: macos-14 + cxxstd: "11,14,17,20,2b" + - toolset: clang + os: macos-15 + cxxstd: "11,14,17,20,23,2c" + - toolset: clang + os: macos-26 + cxxstd: "11,14,17,20,23,2c" 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' || ' ' }} defaults: run: 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 if: matrix.container run: | apt-get update - apt-get -y install sudo python3 git g++ + apt-get -y install sudo python3 git g++ curl xz-utils + + - name: Install nodejs20glibc2.17 + if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }} + run: | + curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz + tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217 + ldd /__e/node20/bin/node + + - uses: actions/checkout@v4 - name: Install packages if: matrix.install @@ -243,26 +291,18 @@ jobs: fail-fast: false matrix: include: - - toolset: msvc-14.0 - cxxstd: 14,latest - addrmd: 32,64 - os: windows-2019 - - toolset: msvc-14.2 - cxxstd: "14,17,20,latest" - addrmd: 32,64 - os: windows-2019 - toolset: msvc-14.3 cxxstd: "14,17,20,latest" addrmd: 32,64 os: windows-2022 - toolset: clang-win - cxxstd: "14,17,latest" + cxxstd: "14,17,20,latest" addrmd: 32,64 os: windows-2022 - toolset: gcc cxxstd: "11,14,17,2a" addrmd: 64 - os: windows-2019 + os: windows-2022 runs-on: ${{matrix.os}} @@ -302,11 +342,8 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-20.04 - - os: ubuntu-22.04 - - os: macos-12 - - os: macos-13 - - os: macos-14 + - os: ubuntu-latest + - os: macos-latest runs-on: ${{matrix.os}} @@ -350,11 +387,8 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-20.04 - - os: ubuntu-22.04 - - os: macos-12 - - os: macos-13 - - os: macos-14 + - os: ubuntu-latest + - os: macos-latest runs-on: ${{matrix.os}} @@ -408,11 +442,8 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-20.04 - - os: ubuntu-22.04 - - os: macos-12 - - os: macos-13 - - os: macos-14 + - os: ubuntu-latest + - os: macos-latest runs-on: ${{matrix.os}} @@ -464,8 +495,7 @@ jobs: fail-fast: false matrix: include: - - os: windows-2019 - - os: windows-2022 + - os: windows-latest runs-on: ${{matrix.os}} @@ -513,8 +543,7 @@ jobs: fail-fast: false matrix: include: - - os: windows-2019 - - os: windows-2022 + - os: windows-latest runs-on: ${{matrix.os}} @@ -580,8 +609,7 @@ jobs: fail-fast: false matrix: include: - - os: windows-2019 - - os: windows-2022 + - os: windows-latest runs-on: ${{matrix.os}} From 721776d544d6f3d466ae9961c6196fda1771f809 Mon Sep 17 00:00:00 2001 From: Dmitry Arkhipov Date: Sat, 17 Jan 2026 21:31:15 +0300 Subject: [PATCH 2/4] remove build subdirectory --- build/Jamfile | 30 ----------- build/preprocess_arity_loops.cpp | 88 -------------------------------- build/preprocess_cc_names.cpp | 27 ---------- build/preprocess_encoding.cpp | 45 ---------------- build/timestamps/arity_loops | 1 - build/timestamps/cc_names | 1 - build/timestamps/encoding | 1 - 7 files changed, 193 deletions(-) delete mode 100644 build/Jamfile delete mode 100644 build/preprocess_arity_loops.cpp delete mode 100644 build/preprocess_cc_names.cpp delete mode 100644 build/preprocess_encoding.cpp delete mode 100644 build/timestamps/arity_loops delete mode 100644 build/timestamps/cc_names delete mode 100644 build/timestamps/encoding diff --git a/build/Jamfile b/build/Jamfile deleted file mode 100644 index 38b185a..0000000 --- a/build/Jamfile +++ /dev/null @@ -1,30 +0,0 @@ - -# (C) Copyright Tobias Schwinger -# -# Use modification and distribution are subject to the boost Software License, -# Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt). - -# Generates preprocessed files with wave. - -actions wave -{ - $(>[1]) -S../../.. $(>[2]) -o $(<) -} - -W = ../../../tools/wave/build//wave ; - -make arity_loops - : preprocess_arity_loops.cpp $(W) : wave : build/timestamps - ; - -make encoding - : preprocess_encoding.cpp $(W) : wave : build/timestamps - ; - - -make cc_names - : preprocess_cc_names.cpp $(W) : wave : build/timestamps - ; - -explicit arity_loops encoding cc_names ; - diff --git a/build/preprocess_arity_loops.cpp b/build/preprocess_arity_loops.cpp deleted file mode 100644 index d39b65c..0000000 --- a/build/preprocess_arity_loops.cpp +++ /dev/null @@ -1,88 +0,0 @@ - -// (C) Copyright Tobias Schwinger -// -// Use modification and distribution are subject to the boost Software License, -// Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt). - -//------------------------------------------------------------------------------ - -#if !defined(BOOST_FT_PREPROCESSING_MODE) - -# ifndef __WAVE__ -# error "Boost.Wave preprocessor required" -# endif - -# include -# include - -# if BOOST_PP_NIL // enable dependency scanning for dynamically included files -# include -# include -# include -# include -# endif - -# pragma wave option(line: 0, preserve: 2) -timestamp file -# pragma wave option(output: null) - -# define BOOST_FT_PREPROCESSING_MODE - -# define BOOST_FT_HEADER \ - BOOST_PP_SEQ_CAT((arity)(BOOST_FT_MAX_ARITY)(_)(BOOST_FT_mfp)).hpp - #define BOOST_FT_OUT_FILE \ - BOOST_PP_STRINGIZE(../../../BOOST_FT_al_path/BOOST_FT_HEADER) - -# define BOOST_FT_al_path boost/function_types/detail/components_impl -# include __FILE__ -# undef BOOST_FT_al_path - -# define BOOST_FT_al_path boost/function_types/detail/synthesize_impl -# include __FILE__ -# undef BOOST_FT_al_path - -# define BOOST_FT_al_path boost/function_types/detail/classifier_impl -# include __FILE__ -# undef BOOST_FT_al_path - -#elif !defined(BOOST_FT_mfp) - -# define BOOST_FT_mfp 0 -# include __FILE__ -# undef BOOST_FT_mfp - -# define BOOST_FT_mfp 1 -# include __FILE__ -# undef BOOST_FT_mfp - -#elif !defined(BOOST_FT_MAX_ARITY) - -# define BOOST_FT_FROM_ARITY 0 -# define BOOST_FT_MAX_ARITY 10 -# include __FILE__ - -# define BOOST_FT_FROM_ARITY 10 -# define BOOST_FT_MAX_ARITY 20 -# include __FILE__ - -# define BOOST_FT_FROM_ARITY 20 -# define BOOST_FT_MAX_ARITY 30 -# include __FILE__ - -# define BOOST_FT_FROM_ARITY 30 -# define BOOST_FT_MAX_ARITY 40 -# include __FILE__ - -# define BOOST_FT_FROM_ARITY 40 -# define BOOST_FT_MAX_ARITY 50 -# include __FILE__ - -#else - -# pragma message(generating BOOST_FT_OUT_FILE) -# pragma wave option(preserve: 2, output: BOOST_FT_OUT_FILE) -# include -# undef BOOST_FT_MAX_ARITY - -#endif - diff --git a/build/preprocess_cc_names.cpp b/build/preprocess_cc_names.cpp deleted file mode 100644 index 803667c..0000000 --- a/build/preprocess_cc_names.cpp +++ /dev/null @@ -1,27 +0,0 @@ - -// (C) Copyright Tobias Schwinger -// -// Use modification and distribution are subject to the boost Software License, -// Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt). - -//------------------------------------------------------------------------------ - -#ifndef __WAVE__ -# error "Boost.Wave preprocessor required" -#endif - -#pragma wave option(line: 0, preserve: 2) -timestamp file -#pragma wave option(output: null) - -#define BOOST_FT_PREPROCESSING_MODE - - -#define BOOST_FT_OUT_FILE \ - "../../../boost/function_types/detail/pp_cc_loop/preprocessed.hpp" -#pragma message(generating BOOST_FT_OUT_FILE) -#pragma wave option(output: BOOST_FT_OUT_FILE, preserve: 2) -#include -#pragma wave option(output: null) -#undef BOOST_FT_OUT_FILE - diff --git a/build/preprocess_encoding.cpp b/build/preprocess_encoding.cpp deleted file mode 100644 index 886bec3..0000000 --- a/build/preprocess_encoding.cpp +++ /dev/null @@ -1,45 +0,0 @@ - -// (C) Copyright Tobias Schwinger -// -// Use modification and distribution are subject to the boost Software License, -// Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt). - -//------------------------------------------------------------------------------ - -#ifndef __WAVE__ -# error "Boost.Wave preprocessor required" -#endif - -#pragma wave option(line: 0, preserve: 2) -timestamp file -#pragma wave option(output: null) - -#define BOOST_FT_PREPROCESSING_MODE - - -#define BOOST_FT_OUT_FILE \ - "../../../boost/function_types/detail/pp_tags/preprocessed.hpp" -#pragma message(generating BOOST_FT_OUT_FILE) -#pragma wave option(output: BOOST_FT_OUT_FILE, preserve: 2) -#include -#pragma wave option(output: null) -#undef BOOST_FT_OUT_FILE - -#define BOOST_FT_OUT_FILE \ - "../../../boost/function_types/detail/pp_variate_loop/preprocessed.hpp" -#pragma message(generating BOOST_FT_OUT_FILE) -#pragma wave option(output: BOOST_FT_OUT_FILE, preserve: 2) -#include -#pragma wave option(output: null) -#undef BOOST_FT_OUT_FILE - -#define BOOST_FT_OUT_FILE \ - "../../../boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp" -#pragma message(generating BOOST_FT_OUT_FILE) -#pragma wave option(output: BOOST_FT_OUT_FILE, preserve: 2) -#include -#pragma wave option(output: null) - -#undef BOOST_FT_OUT_FILE - - diff --git a/build/timestamps/arity_loops b/build/timestamps/arity_loops deleted file mode 100644 index f91091c..0000000 --- a/build/timestamps/arity_loops +++ /dev/null @@ -1 +0,0 @@ -timestamp file diff --git a/build/timestamps/cc_names b/build/timestamps/cc_names deleted file mode 100644 index f91091c..0000000 --- a/build/timestamps/cc_names +++ /dev/null @@ -1 +0,0 @@ -timestamp file diff --git a/build/timestamps/encoding b/build/timestamps/encoding deleted file mode 100644 index f91091c..0000000 --- a/build/timestamps/encoding +++ /dev/null @@ -1 +0,0 @@ -timestamp file From e454e797fbd2e1df704306e8ef70836e8bcb71ae Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 19 Jan 2026 12:23:42 +0200 Subject: [PATCH 3/4] Update appveyor.yml --- appveyor.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 142fca2..937c3aa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,39 +10,38 @@ branches: only: - master - develop + - /feature\/.*/ environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: msvc-10.0,msvc-11.0 - ADDRMD: 32 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: msvc-12.0,msvc-14.0 - ADDRESS_MODEL: 32,64 + TOOLSET: msvc-14.0 + CXXSTD: 14,latest + ADDRMD: 32,64 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 TOOLSET: msvc-14.1 - CXXSTD: 14,17 - ADDRESS_MODEL: 32,64 + CXXSTD: 14,17,latest + ADDRMD: 32,64 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 TOOLSET: msvc-14.2 - CXXSTD: 14,17 - ADDRESS_MODEL: 32,64 + CXXSTD: 14,17,20,latest + ADDRMD: 32,64 install: + - set BOOST_BRANCH=develop + - if "%APPVEYOR_REPO_BRANCH%" == "master" set BOOST_BRANCH=master - cd .. - - git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root + - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root - cd boost-root - - git submodule update --init tools/build - - git submodule update --init libs/config - git submodule update --init tools/boostdep - - git submodule update --init tools/boost_install - - git submodule update --init libs/headers - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\function_types - python tools/boostdep/depinst/depinst.py -I example function_types - - bootstrap - - b2 headers + - cmd /c bootstrap + - b2 -d0 headers build: off test_script: - - b2 libs/function_types/test toolset=%TOOLSET% + - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD% + - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD% + - b2 -j3 libs/function_types/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% variant=debug,release embed-manifest-via=linker From 927329df619b8b2c49ae2a130c2e80d3f66cfa7a Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Thu, 22 Jan 2026 23:05:46 +0300 Subject: [PATCH 4/4] Remove dependencies on Boost.StaticAssert. Boost.StaticAssert has been merged into Boost.Config, so remove the dependency. --- test/cmake_subdir_test/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/test/cmake_subdir_test/CMakeLists.txt b/test/cmake_subdir_test/CMakeLists.txt index e8a7ca0..14be08e 100644 --- a/test/cmake_subdir_test/CMakeLists.txt +++ b/test/cmake_subdir_test/CMakeLists.txt @@ -22,7 +22,6 @@ type_traits # Secondary dependencies assert -static_assert throw_exception predef utility