From 99bd9d9d31eec049b6c879e47f3f4ef33c265e18 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 5 Nov 2022 18:02:14 +0200 Subject: [PATCH] Update ci.yml --- .github/workflows/ci.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd569758..d701cf6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,8 +45,8 @@ jobs: - { compiler: gcc-7, cxxstd: '03,11,14,17', os: ubuntu-20.04, install: 'g++-7' } - { compiler: gcc-8, cxxstd: '03,11,14,17', os: ubuntu-20.04, install: 'g++-8' } - { compiler: gcc-9, cxxstd: '03,11,14,17', os: ubuntu-20.04, install: 'g++-9' } - - { compiler: gcc-10, cxxstd: '03,11,14,17,20', os: ubuntu-20.04, install: 'g++-10' } - - { compiler: gcc-11, cxxstd: '03,11,14,17,20', os: ubuntu-20.04, install: 'g++-11' } + - { compiler: gcc-10, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, install: 'g++-10' } + - { compiler: gcc-11, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, install: 'g++-11' } - { name: "gcc-12 w/ sanitizers (03,11,14)", sanitize: yes, compiler: gcc-12, cxxstd: '03,11,14', os: ubuntu-22.04, ccache_key: "san1" } - { name: "gcc-12 w/ sanitizers (17,20,2b)", sanitize: yes, @@ -57,18 +57,22 @@ jobs: # Linux, clang, libc++ - { compiler: clang-7, cxxstd: '03,11,14,17', os: ubuntu-20.04, stdlib: libc++, install: 'clang-7 libc++-7-dev libc++abi-7-dev' } - { compiler: clang-10, cxxstd: '03,11,14,17,20', os: ubuntu-20.04, stdlib: libc++, install: 'clang-10 libc++-10-dev libc++abi-10-dev' } - - { compiler: clang-11, cxxstd: '03,11,14,17,20', os: ubuntu-20.04, stdlib: libc++, install: 'clang-11 libc++-11-dev libc++abi-11-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-11, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, stdlib: libc++, install: 'clang-11 libc++-11-dev libc++abi-11-dev' } + # clang-12 doesn't work on ubuntu-22.04, the linker can't find -lunwind for some reason + - { name: "clang-12 w/ sanitizers (03,11,14)", sanitize: yes, + compiler: clang-12, cxxstd: '03,11,14', os: ubuntu-20.04, stdlib: libc++, install: 'clang-12 libc++-12-dev libc++abi-12-dev', ccache_key: "san1" } + - { name: "clang-12 w/ sanitizers (17,20,2b)", sanitize: yes, + compiler: clang-12, cxxstd: '17,20,2b', os: ubuntu-20.04, stdlib: libc++, install: 'clang-12 libc++-12-dev libc++abi-12-dev', ccache_key: "san2" } - { compiler: clang-13, cxxstd: '03,11,14,17,20,2b', os: ubuntu-22.04, stdlib: libc++, install: 'clang-13 libc++-13-dev libc++abi-13-dev' } - { compiler: clang-14, cxxstd: '03,11,14,17,20,2b', os: ubuntu-22.04, stdlib: libc++, install: 'clang-14 libc++-14-dev libc++abi-14-dev' } - - { name: "clang-12 w/ sanitizers", sanitize: yes, - compiler: clang-12, cxxstd: '03,11,14,17,20,2b', os: ubuntu-20.04, stdlib: libc++, install: 'clang-12 libc++-12-dev libc++abi-12-dev', ccache_key: "san1" } # not using libc++ because of https://github.com/llvm/llvm-project/issues/52771 - - { name: "clang-14 w/ sanitizers", sanitize: yes, - compiler: clang-14, cxxstd: '03,11,14,17,20,2b', os: ubuntu-22.04, ccache_key: "san2" } + - { name: "clang-14 w/ sanitizers (03,11,14)", sanitize: yes, + compiler: clang-14, cxxstd: '03,11,14', os: ubuntu-22.04, ccache_key: "san1" } + - { name: "clang-14 w/ sanitizers (17,20,2b)", sanitize: yes, + compiler: clang-14, cxxstd: '17,20,2b', os: ubuntu-22.04, ccache_key: "san2" } # OSX, clang - - { compiler: clang, cxxstd: '03,11,14,17,2a', os: macos-11, sanitize: yes } + - { compiler: clang, cxxstd: '03,11,14,17,2a', os: macos-11, sanitize: yes } timeout-minutes: 120 runs-on: ${{matrix.os}}