From e7ed9918c16f11a9b885b043f7aa7994b3e21582 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Fri, 17 Nov 2023 20:05:19 +0300 Subject: [PATCH] Remove C++03 CI jobs, use gcc-11 libstdc++ in clang-12 through 15. --- .github/workflows/ci.yml | 66 ++++++++++++++++++++-------------------- appveyor.yml | 13 +++----- 2 files changed, 38 insertions(+), 41 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d58699..2c25876 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Andrey Semashev +# Copyright 2021-2023 Andrey Semashev # # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) @@ -33,16 +33,8 @@ jobs: matrix: include: # Linux, gcc - - toolset: gcc-4.4 - cxxstd: "98,0x" - os: ubuntu-latest - container: ubuntu:16.04 - install: - - g++-4.4 - sources: - - "ppa:ubuntu-toolchain-r/test" - toolset: gcc-4.6 - cxxstd: "03,0x" + cxxstd: "0x" os: ubuntu-latest container: ubuntu:16.04 install: @@ -50,54 +42,54 @@ jobs: sources: - "ppa:ubuntu-toolchain-r/test" - toolset: gcc-4.7 - cxxstd: "03,11" + cxxstd: "11" os: ubuntu-latest container: ubuntu:16.04 install: - g++-4.7 - toolset: gcc-4.8 - cxxstd: "03,11" + cxxstd: "11" os: ubuntu-latest container: ubuntu:18.04 install: - g++-4.8 - toolset: gcc-4.9 - cxxstd: "03,11" + cxxstd: "11" os: ubuntu-latest container: ubuntu:16.04 install: - g++-4.9 - toolset: gcc-5 - cxxstd: "03,11,14,1z" + cxxstd: "11,14,1z" os: ubuntu-latest container: ubuntu:16.04 install: - g++-5 - toolset: gcc-6 - cxxstd: "03,11,14,1z" + cxxstd: "11,14,1z" os: ubuntu-latest container: ubuntu:18.04 install: - g++-6 - toolset: gcc-7 - cxxstd: "03,11,14,17" + cxxstd: "11,14,17" os: ubuntu-latest container: ubuntu:18.04 install: - g++-7 - toolset: gcc-8 - cxxstd: "03,11,14,17,2a" + cxxstd: "11,14,17,2a" os: ubuntu-latest container: ubuntu:18.04 install: - g++-8 - toolset: gcc-9 - cxxstd: "03,11,14,17,2a" + cxxstd: "11,14,17,2a" os: ubuntu-20.04 install: - g++-9 - toolset: gcc-10 - cxxstd: "03,11,14,17,20" + cxxstd: "11,14,17,20" os: ubuntu-20.04 install: - g++-10 @@ -123,63 +115,63 @@ jobs: # Linux, clang - toolset: clang compiler: clang++-3.5 - cxxstd: "03,11" + cxxstd: "11" os: ubuntu-latest container: ubuntu:16.04 install: - clang-3.5 - toolset: clang compiler: clang++-3.6 - cxxstd: "03,11,14" + cxxstd: "11,14" os: ubuntu-latest container: ubuntu:16.04 install: - clang-3.6 - toolset: clang compiler: clang++-3.7 - cxxstd: "03,11,14" + cxxstd: "11,14" os: ubuntu-latest container: ubuntu:16.04 install: - clang-3.7 - toolset: clang compiler: clang++-3.8 - cxxstd: "03,11,14" + cxxstd: "11,14" os: ubuntu-latest container: ubuntu:16.04 install: - clang-3.8 - toolset: clang compiler: clang++-3.9 - cxxstd: "03,11,14" + cxxstd: "11,14" os: ubuntu-latest container: ubuntu:18.04 install: - clang-3.9 - toolset: clang compiler: clang++-4.0 - cxxstd: "03,11,14" + cxxstd: "11,14" os: ubuntu-latest container: ubuntu:18.04 install: - clang-4.0 - toolset: clang compiler: clang++-5.0 - cxxstd: "03,11,14,1z" + cxxstd: "11,14,1z" os: ubuntu-latest container: ubuntu:18.04 install: - clang-5.0 - toolset: clang compiler: clang++-6.0 - cxxstd: "03,11,14,17" + cxxstd: "11,14,17" os: ubuntu-latest container: ubuntu:18.04 install: - clang-6.0 - toolset: clang compiler: clang++-7 - cxxstd: "03,11,14,17" + cxxstd: "11,14,17" os: ubuntu-latest container: ubuntu:18.04 install: @@ -187,7 +179,7 @@ jobs: # Note: clang-8 does not fully support C++20, so it is not compatible with libstdc++-8 in this mode - toolset: clang compiler: clang++-8 - cxxstd: "03,11,14,17,2a" + cxxstd: "11,14,17,2a" os: ubuntu-latest container: ubuntu:18.04 install: @@ -196,19 +188,19 @@ jobs: gcc_toolchain: 7 - toolset: clang compiler: clang++-9 - cxxstd: "03,11,14,17,2a" + cxxstd: "11,14,17,2a" os: ubuntu-20.04 install: - clang-9 - toolset: clang compiler: clang++-10 - cxxstd: "03,11,14,17,20" + cxxstd: "11,14,17,20" os: ubuntu-20.04 install: - clang-10 - toolset: clang compiler: clang++-11 - cxxstd: "03,11,14,17,20" + cxxstd: "11,14,17,20" os: ubuntu-22.04 install: - clang-11 @@ -218,24 +210,32 @@ jobs: os: ubuntu-22.04 install: - clang-12 + - g++-11 + gcc_toolchain: 11 - toolset: clang compiler: clang++-13 cxxstd: "03-gnu,11-gnu,14-gnu,17-gnu,20-gnu,2b-gnu" os: ubuntu-22.04 install: - clang-13 + - g++-11 + gcc_toolchain: 11 - toolset: clang compiler: clang++-14 cxxstd: "03-gnu,11-gnu,14-gnu,17-gnu,20-gnu,2b-gnu" os: ubuntu-22.04 install: - clang-14 + - g++-11 + gcc_toolchain: 11 - toolset: clang compiler: clang++-15 cxxstd: "03-gnu,11-gnu,14-gnu,17-gnu,20-gnu,2b-gnu" os: ubuntu-22.04 install: - clang-15 + - g++-11 + gcc_toolchain: 11 - toolset: clang compiler: clang++-15 cxxstd: "03-gnu,11-gnu,14-gnu,17-gnu,20-gnu,2b-gnu" @@ -285,7 +285,7 @@ jobs: - libc++abi-15-dev - toolset: clang - cxxstd: "03,11,14,17,2a" + cxxstd: "11,14,17,2a" os: macos-11 timeout-minutes: 60 diff --git a/appveyor.yml b/appveyor.yml index 4673da6..6ce3fa8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,9 +14,6 @@ branches: environment: matrix: - - TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0 - ADDRMD: 32 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: msvc-14.0 CXXSTD: 14,latest ADDRMD: 32,64 @@ -38,23 +35,23 @@ environment: CXXSTD: 14,17,latest APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - TOOLSET: gcc - CXXSTD: 03,11,14,1z + CXXSTD: 11,14,1z ADDPATH: C:\cygwin\bin; APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: gcc - CXXSTD: 03,11,14,1z + CXXSTD: 11,14,1z ADDPATH: C:\cygwin64\bin; APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: gcc - CXXSTD: 03,11,14,1z + CXXSTD: 11,14,1z ADDPATH: C:\mingw\bin; APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: gcc - CXXSTD: 03,11,14,1z + CXXSTD: 11,14,1z ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin; APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: gcc - CXXSTD: 03,11,14,1z + CXXSTD: 11,14,1z ADDPATH: C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin; APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015