From 71c42c00d988871b3ccbd5fc1a8335f87979bc98 Mon Sep 17 00:00:00 2001 From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)" Date: Wed, 8 Oct 2025 16:10:15 +0100 Subject: [PATCH] - Bump Boost min cmake required to 3.10 to match standalone Outcome. Also bump minium cmake to 3.10 everywhere else in Outcome, as CI is now failing due to us requested too old a cmake. #314 Replaces https://github.com/boostorg/outcome/pull/8 --- .ci.cmake | 2 +- .docs.cmake | 2 +- .github/workflows/unittests_windows.yml | 12 ++++++------ CMakeLists.txt | 2 +- abi-compliance/CMakeLists.txt | 2 +- boostify/.github/workflows/ci.yml | 10 +++++----- boostify/CMakeLists.txt | 2 +- conan/test_package/CMakeLists.txt | 2 +- doc/src/content/changelog/_index.md | 17 +++++++++++++---- include/outcome/detail/revision.hpp | 6 +++--- 10 files changed, 33 insertions(+), 24 deletions(-) diff --git a/.ci.cmake b/.ci.cmake index d26de7ec..fdcd5ab1 100644 --- a/.ci.cmake +++ b/.ci.cmake @@ -1,6 +1,6 @@ # CTest script for a CI to submit to CDash a run of configuration, # building and testing -cmake_minimum_required(VERSION 3.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10...4.0 FATAL_ERROR) include(cmake/QuickCppLibBootstrap.cmake) include(QuickCppLibUtils) diff --git a/.docs.cmake b/.docs.cmake index 40b387e3..d6e6fa86 100644 --- a/.docs.cmake +++ b/.docs.cmake @@ -1,5 +1,5 @@ # CTest script for a CI to submit to CDash a documentation generation run -cmake_minimum_required(VERSION 3.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10...4.0 FATAL_ERROR) include(cmake/QuickCppLibBootstrap.cmake) include(QuickCppLibUtils) diff --git a/.github/workflows/unittests_windows.yml b/.github/workflows/unittests_windows.yml index 404c8395..dc8a4eac 100644 --- a/.github/workflows/unittests_windows.yml +++ b/.github/workflows/unittests_windows.yml @@ -10,11 +10,11 @@ on: - cron: '0 0 1 * *' jobs: - WinVS2019: - name: Windows VS2019 - runs-on: windows-2019 + WinVS2022: + name: Windows VS2022 + runs-on: windows-2022 env: - NAME: WinVS2019 + NAME: WinVS2022 steps: - uses: actions/checkout@v4 @@ -28,12 +28,12 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: Windows VS2019 test results + name: Windows VS2022 test results path: prebuilt/merged_junit_results.xml publish-test-results: name: "Publish Unit Tests Results" - needs: [WinVS2019] + needs: [WinVS2022] runs-on: ubuntu-latest if: success() || failure() diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d8c1267..f5b22e24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ # (See accompanying file Licence.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -cmake_minimum_required(VERSION 3.10 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10...4.0 FATAL_ERROR) set(OUTCOME_DEPENDENCY_QUICKCPPLIB_GIT_TAG "master" CACHE STRING "Which git tag to use for the QuickCppLib dependency") if(NOT OUTCOME_DEPENDENCY_QUICKCPPLIB_GIT_TAG STREQUAL "master") diff --git a/abi-compliance/CMakeLists.txt b/abi-compliance/CMakeLists.txt index 9134a807..01fcef76 100644 --- a/abi-compliance/CMakeLists.txt +++ b/abi-compliance/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10...4.0 FATAL_ERROR) if(NOT DEFINED LABEL) set(LABEL default) diff --git a/boostify/.github/workflows/ci.yml b/boostify/.github/workflows/ci.yml index 531d322e..5658da61 100644 --- a/boostify/.github/workflows/ci.yml +++ b/boostify/.github/workflows/ci.yml @@ -20,20 +20,20 @@ jobs: include: - { name: "MSVC 14.3 - C++17-20", os: windows-2022, cxxstd: '17,20', cmake_args: -G "Visual Studio 17 2022" -A x64, } - { name: "clang-cl 14.3 - C++14,20", os: windows-2022, cxxstd: '14,20', cmake_args: -G "Visual Studio 17 2022" -T ClangCL -A x64, } - - { name: "MSVC 14.2 - C++14-17", os: windows-2019, cxxstd: '14,17', cmake_args: -G "Visual Studio 16 2019" -A x64, } +# - { name: "MSVC 14.2 - C++14-17", os: windows-2019, cxxstd: '14,17', cmake_args: -G "Visual Studio 16 2019" -A x64, } - { name: "GCC 12 - C++17-20", os: ubuntu-22.04, cc: gcc-12, cxx: g++-12, cxxstd: '17,20', install: g++-12, } - { name: "GCC 11 - C++14,20", os: ubuntu-22.04, cc: gcc-11, cxx: g++-11, cxxstd: '14,20', install: g++-11, } # The GCC 10 this runner has is broken # - { name: "GCC 10 - C++17-20", os: ubuntu-22.04, cc: gcc-10, cxx: g++-10, cxxstd: '17,20', } - - { name: "GCC 9 - C++17-20", os: ubuntu-22.04, cc: gcc-9, cxx: g++-9, cxxstd: '17,20', install: g++-9, } - - { name: "GCC 8 - C++14-17", os: ubuntu-20.04, cc: gcc-8, cxx: g++-8, cxxstd: '14,17', install: g++-8, } - - { name: "GCC 7 - C++14", os: ubuntu-20.04, cc: gcc-7, cxx: g++-7, cxxstd: 14, install: g++-7, } +# - { name: "GCC 9 - C++17-20", os: ubuntu-22.04, cc: gcc-9, cxx: g++-9, cxxstd: '17,20', install: g++-9, } +# - { name: "GCC 8 - C++14-17", os: ubuntu-20.04, cc: gcc-8, cxx: g++-8, cxxstd: '14,17', install: g++-8, } +# - { name: "GCC 7 - C++14", os: ubuntu-20.04, cc: gcc-7, cxx: g++-7, cxxstd: 14, install: g++-7, } - { name: "Clang 14 - C++17-20", os: ubuntu-22.04, cc: clang-14, cxx: clang++-14, cxxstd: '17,20', install: clang-14, } - { name: "Clang 13 - C++14,20", os: ubuntu-22.04, cc: clang-13, cxx: clang++-13, cxxstd: '14,20', install: clang-13, } - { name: "Clang 12 - C++17-20", os: ubuntu-22.04, cc: clang-12, cxx: clang++-12, cxxstd: '17,20', install: clang-12, } - - { name: "Clang 11 - C++14-17", os: ubuntu-20.04, cc: clang-11, cxx: clang++-11, cxxstd: '14,17', install: clang-11, } +# - { name: "Clang 11 - C++14-17", os: ubuntu-20.04, cc: clang-11, cxx: clang++-11, cxxstd: '14,17', install: clang-11, } - { name: "AppleClang 13", os: macos-12, cxxstd: 17 } diff --git a/boostify/CMakeLists.txt b/boostify/CMakeLists.txt index 83742660..7d051f08 100644 --- a/boostify/CMakeLists.txt +++ b/boostify/CMakeLists.txt @@ -3,7 +3,7 @@ # Distributed under the Boost Software License, Version 1.0. # https://www.boost.org/LICENSE_1_0.txt -cmake_minimum_required(VERSION 3.5...3.16) +cmake_minimum_required(VERSION 3.10...4.0 FATAL_ERROR) project(boost_outcome VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX) diff --git a/conan/test_package/CMakeLists.txt b/conan/test_package/CMakeLists.txt index 553ede5b..5c32cfb2 100644 --- a/conan/test_package/CMakeLists.txt +++ b/conan/test_package/CMakeLists.txt @@ -1,5 +1,5 @@ project(OutcomePackageTest CXX) -cmake_minimum_required(VERSION 3.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10...4.0 FATAL_ERROR) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/doc/src/content/changelog/_index.md b/doc/src/content/changelog/_index.md index d4ceb399..edc92e2c 100644 --- a/doc/src/content/changelog/_index.md +++ b/doc/src/content/changelog/_index.md @@ -4,7 +4,19 @@ weight = 80 +++ --- -## v2.2.13 ? (Boost 1.89) [[release]](https://github.com/ned14/outcome/releases/tag/v2.2.13) +## v2.2.14 ? (Boost 1.90) [[release]](https://github.com/ned14/outcome/releases/tag/v2.2.14) + +### Enhancements: + +[#314](https://github.com/ned14/outcome/issues/314) +- Bump Boost min cmake required to 3.10 to match standalone Outcome. Also bump minium cmake to 3.10 +everywhere else in Outcome, as CI is now failing due to us requested too old a cmake. + +### Bug fixes: + + +--- +## v2.2.13 6th August 2025 (Boost 1.89) [[release]](https://github.com/ned14/outcome/releases/tag/v2.2.13) ### Enhancements: @@ -14,9 +26,6 @@ weight = 80 [#313](https://github.com/ned14/outcome/issues/313) - Bump min cmake required to 3.10 amongst other cmake modernisation fixes to please cmake 4.0. -### Bug fixes: - - --- ## v2.2.12 10th April 2025 (Boost 1.88) [[release]](https://github.com/ned14/outcome/releases/tag/v2.2.12) diff --git a/include/outcome/detail/revision.hpp b/include/outcome/detail/revision.hpp index 740bcc91..859bc705 100644 --- a/include/outcome/detail/revision.hpp +++ b/include/outcome/detail/revision.hpp @@ -22,6 +22,6 @@ Distributed under the Boost Software License, Version 1.0. */ // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time -#define OUTCOME_PREVIOUS_COMMIT_REF 7cfef8288ae1cb68c44e4ee88fde6c4e39e6d095 -#define OUTCOME_PREVIOUS_COMMIT_DATE "2025-05-20 12:55:03 +00:00" -#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 7cfef828 +#define OUTCOME_PREVIOUS_COMMIT_REF 744da6b7536f2850df972ab01504e3c4d9530149 +#define OUTCOME_PREVIOUS_COMMIT_DATE "2025-05-21 12:10:22 +00:00" +#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 744da6b7