From f4d7a9c97b01a76064f60abf7d4f8f984a0bc525 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Wed, 27 Nov 2024 17:43:26 +0100 Subject: [PATCH 1/2] GHA: Use GCC 13 for coverage --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2532d589..3cade461 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,11 +98,11 @@ jobs: - { compiler: gcc-12, cxxstd: '11,14,17,20', os: ubuntu-22.04 } - { compiler: gcc-13, cxxstd: '11,14,17,20,2b', os: ubuntu-24.04 } - { compiler: gcc-14, cxxstd: '11,14,17,20,2b', os: ubuntu-24.04 } - + - { name: GCC w/ sanitizers, sanitize: yes, compiler: gcc-13, cxxstd: '11,14,17,20', os: ubuntu-24.04 } - { name: Collect coverage, coverage: yes, - compiler: gcc-8, cxxstd: '11,2a', os: ubuntu-20.04, install: 'g++-8-multilib', address-model: '32,64' } + compiler: gcc-13, cxxstd: '11,2a', os: ubuntu-20.04, install: 'g++-13-multilib', address-model: '32,64' } # Linux, clang - { compiler: clang-3.5, cxxstd: '11', os: ubuntu-latest, container: 'ubuntu:16.04' } From 6558a4ed12dd2826067902b259637414a8c0d9a8 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Fri, 29 Nov 2024 09:23:38 +0100 Subject: [PATCH 2/2] Use Ubuntu 24 for GCC 13 coverage --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cade461..9928e50f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,7 +102,7 @@ jobs: - { name: GCC w/ sanitizers, sanitize: yes, compiler: gcc-13, cxxstd: '11,14,17,20', os: ubuntu-24.04 } - { name: Collect coverage, coverage: yes, - compiler: gcc-13, cxxstd: '11,2a', os: ubuntu-20.04, install: 'g++-13-multilib', address-model: '32,64' } + compiler: gcc-13, cxxstd: '11,2a', os: ubuntu-24.04, install: 'g++-13-multilib', address-model: '32,64' } # Linux, clang - { compiler: clang-3.5, cxxstd: '11', os: ubuntu-latest, container: 'ubuntu:16.04' }