From 1db3e791019a50ef46b5d140b2e99ff65ee91fdd Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Mon, 1 Dec 2025 11:17:26 +0100 Subject: [PATCH] Containerize builds using deprecated OSes --- .github/workflows/ci.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c4b95f4..c97f8a5c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,11 +47,11 @@ jobs: # Linux, gcc - { compiler: gcc-5, cxxstd: '03,11,14,1z', os: ubuntu-22.04, container: 'ubuntu:18.04' } - { compiler: gcc-6, cxxstd: '03,11,14,17', os: ubuntu-22.04, container: 'ubuntu:18.04' } - - { compiler: gcc-7, cxxstd: '03,11,14,17', os: ubuntu-20.04 } - - { compiler: gcc-8, cxxstd: '03,11,14,17,2a', os: ubuntu-20.04 } - - { compiler: gcc-9, cxxstd: '03,11,14,17,2a', os: ubuntu-20.04 } - - { compiler: gcc-10, cxxstd: '03,11,14,17,20', os: ubuntu-20.04 } - - { compiler: gcc-11, cxxstd: '03,11,14,17,20', os: ubuntu-20.04 } + - { compiler: gcc-7, cxxstd: '03,11,14,17', os: ubuntu-24.04, container: 'ubuntu-20.04' } + - { compiler: gcc-8, cxxstd: '03,11,14,17,2a', os: ubuntu-24.04, container: 'ubuntu-20.04' } + - { compiler: gcc-9, cxxstd: '03,11,14,17,2a', os: ubuntu-24.04, container: 'ubuntu-20.04' } + - { compiler: gcc-10, cxxstd: '03,11,14,17,20', os: ubuntu-24.04, container: 'ubuntu-20.04' } + - { compiler: gcc-11, cxxstd: '03,11,14,17,20', os: ubuntu-24.04, container: 'ubuntu-20.04' } - { compiler: gcc-12, cxxstd: '03,11,14,17,20', os: ubuntu-22.04 } - { name: GCC w/ sanitizers, sanitize: yes, compiler: gcc-12, cxxstd: '03,11,14,17,20', os: ubuntu-22.04 } @@ -64,10 +64,10 @@ jobs: - { compiler: clang-7, cxxstd: '03,11,14,17', os: ubuntu-22.04, container: 'ubuntu:18.04' } # Note: clang-8 does not fully support C++20, so it is not compatible with some libstdc++ versions in this mode - { compiler: clang-8, cxxstd: '03,11,14,17,2a', os: ubuntu-22.04, container: 'ubuntu:18.04', install: 'clang-8 g++-7', gcc_toolchain: 7 } - - { compiler: clang-9, cxxstd: '03,11,14,17,2a', os: ubuntu-20.04 } - - { 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-9, cxxstd: '03,11,14,17,2a', os: ubuntu-24.04, container: 'ubuntu-20.04' } + - { compiler: clang-10, cxxstd: '03,11,14,17,20', os: ubuntu-24.04, container: 'ubuntu-20.04' } + - { compiler: clang-11, cxxstd: '03,11,14,17,20', os: ubuntu-24.04, container: 'ubuntu-20.04' } + - { compiler: clang-12, cxxstd: '03,11,14,17,20', os: ubuntu-24.04, container: 'ubuntu-20.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 } @@ -77,14 +77,15 @@ jobs: # 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' } - - { compiler: clang-12, cxxstd: '03,11,14,17,20', os: ubuntu-20.04, stdlib: libc++, install: 'clang-12 libc++-12-dev libc++abi-12-dev' } + - { compiler: clang-12, cxxstd: '03,11,14,17,20', os: ubuntu-24.04, container: 'ubuntu-20.04', stdlib: libc++, install: 'clang-12 libc++-12-dev libc++abi-12-dev' } - { name: Clang w/ sanitizers, sanitize: yes, - compiler: clang-12, cxxstd: '03,11,14,17,20', os: ubuntu-20.04, stdlib: libc++, install: 'clang-12 libc++-12-dev libc++abi-12-dev' } + compiler: clang-12, cxxstd: '03,11,14,17,20', os: ubuntu-24.04, container: 'ubuntu-20.04', stdlib: libc++, install: 'clang-12 libc++-12-dev libc++abi-12-dev' } # OSX, clang - - { compiler: clang, cxxstd: '03,11,14,17,20', os: macos-12 } + - { compiler: clang, cxxstd: '03,11,14,17,20', os: macos-14 } + - { compiler: clang, cxxstd: '03,11,14,17,20', os: macos-15 } - { name: MacOS w/ clang and sanitizers, - compiler: clang, cxxstd: '03,11,14,17,20,2b', os: macos-13, sanitize: yes } + compiler: clang, cxxstd: '03,11,14,17,20,2b', os: macos-15, sanitize: yes } timeout-minutes: 120 runs-on: ${{matrix.os}} @@ -225,7 +226,6 @@ jobs: fail-fast: false matrix: include: - - { toolset: msvc-14.2, cxxstd: '14,17,20', addrmd: '32,64', os: windows-2019 } - { toolset: msvc-14.3, cxxstd: '14,17,20,latest',addrmd: '32,64', os: windows-2022 } #- { name: Collect coverage, coverage: yes, # toolset: msvc-14.3, cxxstd: 'latest', addrmd: '64', os: windows-2022 }