From 26bc5d540efacdfcfac43b201d677ac5b0416a64 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Fri, 3 Nov 2023 14:46:45 +0100 Subject: [PATCH 1/7] Avoid warning in test --- test/test_fs.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/test_fs.cpp b/test/test_fs.cpp index ce4cedbc..628d7ca3 100644 --- a/test/test_fs.cpp +++ b/test/test_fs.cpp @@ -13,8 +13,10 @@ #include #include #include -#include #include +#if defined(__cpp_lib_quoted_string_io) && __cpp_lib_quoted_string_io >= 201304 +#include +#endif #include "test.hpp" #include #include From b7a4fa5f566ef0ac5673868de3c7b994be989c53 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sat, 4 Nov 2023 10:31:27 +0100 Subject: [PATCH 2/7] Include iomanip before checking feature macros --- test/test_fs.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/test_fs.cpp b/test/test_fs.cpp index 628d7ca3..315f20f6 100644 --- a/test/test_fs.cpp +++ b/test/test_fs.cpp @@ -14,11 +14,14 @@ #include #include #include +#include "test.hpp" + +#include // Required for feature macro check below +// Conditional include to avoid warning/message #if defined(__cpp_lib_quoted_string_io) && __cpp_lib_quoted_string_io >= 201304 #include #endif -#include "test.hpp" -#include + #include #include #if defined(_MSC_VER) From 20bde3d48c72de659cdbade45cf5d461e6b02e98 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sat, 4 Nov 2023 10:55:23 +0100 Subject: [PATCH 3/7] Fix GHA --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9296b70b..61f64e2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,8 +78,9 @@ jobs: - { compiler: clang-10, cxxstd: '03,11,14,17,20', os: ubuntu-20.04 } - { compiler: clang-11, cxxstd: '03,11,14,17,20', os: ubuntu-20.04 } - { compiler: clang-12, cxxstd: '03,11,14,17,20', os: ubuntu-20.04 } - - { compiler: clang-13, cxxstd: '03,11,14,17,20', os: ubuntu-22.04 } - - { compiler: clang-14, cxxstd: '03,11,14,17,20', os: ubuntu-22.04 } + - { compiler: clang-13, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, container: 'ubuntu:22.04' } + - { compiler: clang-14, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, container: 'ubuntu:22.04' } + - { compiler: clang-15, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, container: 'ubuntu:22.04' } # libc++ - { compiler: clang-6.0, cxxstd: '03,11,14', os: ubuntu-22.04, container: 'ubuntu:18.04', stdlib: libc++, install: 'clang-6.0 libc++-dev libc++abi-dev' } @@ -104,9 +105,9 @@ jobs: fi if [ -n "${{matrix.container}}" ] && [ -f "/etc/debian_version" ]; then apt-get -o Acquire::Retries=$NET_RETRY_COUNT update - apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common + apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common curl # Need (newer) git, and the older Ubuntu container may require requesting the key manually using port 80 - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E1DD270288B4E6030699E45FA1715D88E1DF1F24 + curl -sSL --retry ${NET_RETRY_COUNT:-5} 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xE1DD270288B4E6030699E45FA1715D88E1DF1F24' | sudo gpg --dearmor > /etc/apt/trusted.gpg.d/git-core_ubuntu_ppa.gpg for i in {1..${NET_RETRY_COUNT:-3}}; do sudo -E add-apt-repository -y ppa:git-core/ppa && break || sleep 10; done apt-get -o Acquire::Retries=$NET_RETRY_COUNT update apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y g++ python libpython-dev git From fcb82d53e8eef987be74d030c67b97c5973fe78a Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sat, 4 Nov 2023 11:04:47 +0100 Subject: [PATCH 4/7] GHA: Don't use Ubuntu 22 container yet --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61f64e2a..0679d9ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,9 +78,9 @@ jobs: - { compiler: clang-10, cxxstd: '03,11,14,17,20', os: ubuntu-20.04 } - { compiler: clang-11, cxxstd: '03,11,14,17,20', os: ubuntu-20.04 } - { compiler: clang-12, cxxstd: '03,11,14,17,20', os: ubuntu-20.04 } - - { compiler: clang-13, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, container: 'ubuntu:22.04' } - - { compiler: clang-14, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, container: 'ubuntu:22.04' } - - { compiler: clang-15, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, container: 'ubuntu:22.04' } + # Clang isn't compatible with libstdc++-13, so use the slightly older one + - { compiler: clang-13, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, install: 'clang-13 g++-12', gcc_toolchain: 12 } + - { compiler: clang-14, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, install: 'clang-14 g++-12', gcc_toolchain: 12 } # libc++ - { compiler: clang-6.0, cxxstd: '03,11,14', os: ubuntu-22.04, container: 'ubuntu:18.04', stdlib: libc++, install: 'clang-6.0 libc++-dev libc++abi-dev' } From 3d2a2c2d3986eac3b1a7accba8bde68c7275030c Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sat, 4 Nov 2023 15:50:07 +0100 Subject: [PATCH 5/7] AzP: Fix Clang11+ --- .azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 3d1cc401..ed3cb7a4 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -50,8 +50,8 @@ parameters: - { compiler: clang-8, cxxstd: '14,17', os: ubuntu-20.04 } - { compiler: clang-9, cxxstd: '14,17,2a', os: ubuntu-20.04 } - { compiler: clang-10, cxxstd: '14,17,20', os: ubuntu-20.04 } - - { compiler: clang-11, cxxstd: '14,17,20', os: ubuntu-22.04 } - - { compiler: clang-12, cxxstd: '14,17,20', os: ubuntu-22.04 } + - { compiler: clang-11, cxxstd: '14,17,20', os: ubuntu-20.04 } + - { compiler: clang-14, cxxstd: '14,17,20', os: ubuntu-22.04, gcc_toolchain: 12 } - { name: Linux_clang_6_libcxx, compiler: clang-6.0, cxxstd: '11,14,17', os: ubuntu-20.04, container: 'ubuntu:18.04', install: 'clang-6.0 libc++-dev libc++abi-dev', env: {B2_STDLIB: libc++ } } # OSX From 157252a655d3c50b6606bdc5ba454b62d26a810a Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sat, 4 Nov 2023 15:50:10 +0100 Subject: [PATCH 6/7] Appveyor: Update of preinstalled Boost version used --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 08cf18de..f7c7d16c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -138,7 +138,7 @@ environment: CMAKE_FLAGS: -DBOOST_NOWIDE_DISABLE_CIN_TEST=ON GENERATOR: Visual Studio 17 2022 configuration: Debug - BOOST_ROOT: C:\Libraries\boost_1_77_0 + BOOST_ROOT: C:\Libraries\boost_1_83_0 # Coverity - COVERITY: true From 30f94c84f567b93a46e1e3df4e83f440303f871a Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sat, 4 Nov 2023 16:34:36 +0100 Subject: [PATCH 7/7] AzP: Add missing GCC_TOOLCHAIN code --- .azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index ed3cb7a4..4ec1992a 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -94,6 +94,8 @@ stages: XCODE_APP: /Applications/Xcode_${{ item.xcode }}.app ${{ if item.install }}: PACKAGES: ${{ item.install }} + ${{ if item.gcc_toolchain }}: + GCC_TOOLCHAIN: ${{ item.gcc_toolchain }} ${{ each var in item.env }}: ${{var.Key}}: ${{var.Value}} steps: