From 0ae6eabf7b8c38c9fb0a8f67033cfb5e723424b1 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Tue, 16 Apr 2024 22:20:54 +0300 Subject: [PATCH 1/5] Update doc/Jamfile --- doc/Jamfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Jamfile b/doc/Jamfile index 417891c..210235d 100644 --- a/doc/Jamfile +++ b/doc/Jamfile @@ -5,7 +5,7 @@ # See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt -import asciidoctor ; +using asciidoctor ; html mp11.html : mp11.adoc ; From 9f88e11d11bd12f2c36a7d9b8d9c9c976870bd5b Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Tue, 16 Apr 2024 22:34:54 +0300 Subject: [PATCH 2/5] Revert "Update doc/Jamfile" This reverts commit 0ae6eabf7b8c38c9fb0a8f67033cfb5e723424b1. --- doc/Jamfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Jamfile b/doc/Jamfile index 210235d..417891c 100644 --- a/doc/Jamfile +++ b/doc/Jamfile @@ -5,7 +5,7 @@ # See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt -using asciidoctor ; +import asciidoctor ; html mp11.html : mp11.adoc ; From 1faf5df8065791f688ce97fcd46dc7ff7ac465d6 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 18 Apr 2024 11:31:22 +0300 Subject: [PATCH 3/5] Update appveyor.yml --- appveyor.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b433eac..b6a7184 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,7 +23,15 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 TOOLSET: msvc-14.1 - CXXSTD: 14,17,latest + CXXSTD: 14 + + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + TOOLSET: msvc-14.1 + CXXSTD: 17 + + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + TOOLSET: msvc-14.1 + CXXSTD: latest - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 CMAKE: 1 @@ -31,24 +39,19 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 CMAKE_SUBDIR: 1 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 CMAKE_INSTALL: 1 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - CMAKE: 1 - CONFIG: MinSizeRel - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 CMAKE_SUBDIR: 1 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 CMAKE_INSTALL: 1 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CMAKE: 1 - CONFIG: MinSizeRel - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 CMAKE_SUBDIR: 1 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 CMAKE_INSTALL: 1 From 859a30e46f0a368d54d9eedb44343a80ce5caef1 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 18 Apr 2024 12:06:16 +0300 Subject: [PATCH 4/5] Update version --- CMakeLists.txt | 2 +- include/boost/mp11/version.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f97464c..77a8e78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.5...3.16) -project(boost_mp11 VERSION 1.85.0 LANGUAGES CXX) +project(boost_mp11 VERSION 1.86.0 LANGUAGES CXX) add_library(boost_mp11 INTERFACE) add_library(Boost::mp11 ALIAS boost_mp11) diff --git a/include/boost/mp11/version.hpp b/include/boost/mp11/version.hpp index aba1fb1..d991a76 100644 --- a/include/boost/mp11/version.hpp +++ b/include/boost/mp11/version.hpp @@ -11,6 +11,6 @@ // Same format as BOOST_VERSION: // major * 100000 + minor * 100 + patch -#define BOOST_MP11_VERSION 108500 +#define BOOST_MP11_VERSION 108600 #endif // #ifndef BOOST_MP11_VERSION_HPP_INCLUDED From d0f3481b210a3baf49ce16d7b595ba5f4bee8ce6 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 18 Apr 2024 13:24:23 +0300 Subject: [PATCH 5/5] Update ci.yml --- .github/workflows/ci.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e0b6eb..4e74efa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,18 +19,23 @@ jobs: include: - toolset: gcc-4.8 cxxstd: "03,11" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: g++-4.8 + - toolset: gcc-4.9 + cxxstd: "03,11" + container: ubuntu:16.04 + os: ubuntu-latest + install: g++-4.9 - toolset: gcc-5 cxxstd: "03,11,14,1z" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: g++-5 - toolset: gcc-6 cxxstd: "03,11,14,1z" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: g++-6 - toolset: gcc-7 cxxstd: "03,11,14,17" @@ -148,6 +153,9 @@ jobs: - toolset: clang cxxstd: "03,11,14,17,20,2b" os: macos-13 + - toolset: clang + cxxstd: "03,11,14,17,20,2b" + os: macos-14 runs-on: ${{matrix.os}} container: ${{matrix.container}} @@ -189,7 +197,7 @@ jobs: cd boost-root cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY git submodule update --init tools/boostdep - python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY + python3 tools/boostdep/depinst/depinst.py $LIBRARY ./bootstrap.sh ./b2 -d0 headers