From 2fe99b4f1e8287c0562daf1da8f077fefde0c7ee Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 19 Dec 2024 11:29:29 +0100 Subject: [PATCH] Update drone jobs after PPA removal --- .drone.star | 14 +++++++------- .github/workflows/ci.yml | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.drone.star b/.drone.star index 35846838..7667143d 100644 --- a/.drone.star +++ b/.drone.star @@ -28,11 +28,11 @@ def main(ctx): job(compiler='clang-3.9', cxxstd='11,14', os='ubuntu-18.04'), job(compiler='clang-4.0', cxxstd='11,14', os='ubuntu-18.04'), job(compiler='clang-5.0', cxxstd='11,14,1z', os='ubuntu-18.04'), - job(compiler='clang-6.0', cxxstd='11,14,17', os='ubuntu-18.04'), - job(compiler='clang-7', cxxstd='11,14,17', os='ubuntu-18.04'), - job(compiler='clang-8', cxxstd='11,14,17,2a', os='ubuntu-18.04'), - job(compiler='clang-9', cxxstd='11,14,17,2a', os='ubuntu-18.04'), - job(compiler='clang-10', cxxstd='11,14,17,2a', os='ubuntu-18.04'), + job(compiler='clang-6.0', cxxstd='11,14,17', os='ubuntu-20.04'), + job(compiler='clang-7', cxxstd='11,14,17', os='ubuntu-20.04'), + job(compiler='clang-8', cxxstd='11,14,17,2a', os='ubuntu-20.04'), + job(compiler='clang-9', cxxstd='11,14,17,2a', os='ubuntu-20.04'), + job(compiler='clang-10', cxxstd='11,14,17,2a', os='ubuntu-20.04'), job(compiler='clang-11', cxxstd='11,14,17,2a', os='ubuntu-22.04'), job(compiler='clang-12', cxxstd='11,14,17,20', os='ubuntu-22.04'), job(compiler='clang-13', cxxstd='11,14,17,20,2b', os='ubuntu-22.04'), @@ -46,7 +46,7 @@ def main(ctx): job(compiler='gcc-6', cxxstd='11,14,1z', os='ubuntu-18.04'), job(compiler='gcc-7', cxxstd='11,14,1z', os='ubuntu-18.04'), job(compiler='gcc-8', cxxstd='11,14,17,2a', os='ubuntu-18.04'), - job(compiler='gcc-9', cxxstd='11,14,17,2a', os='ubuntu-18.04'), + job(compiler='gcc-9', cxxstd='11,14,17,2a', os='ubuntu-20.04'), job(compiler='gcc-10', cxxstd='11,14,17,20', os='ubuntu-22.04'), job(compiler='gcc-11', cxxstd='11,14,17,20,2b', os='ubuntu-22.04'), job(compiler='gcc-12', cxxstd='11,14,17,20,2b', os='ubuntu-22.04'), @@ -99,7 +99,7 @@ def main(ctx): job(compiler='clang', cxxstd='11,14,17,20,2b', os='osx-xcode-15.0.1'), # ARM64 job(compiler='clang-12', cxxstd='11,14,17,20', os='ubuntu-20.04', arch='arm64', add_llvm=True), - job(compiler='gcc-11', cxxstd='11,14,17,20', os='ubuntu-20.04', arch='arm64'), + job(compiler='gcc-11', cxxstd='11,14,17,20', os='ubuntu-22.04', arch='arm64'), # S390x job(compiler='clang-12', cxxstd='11,14,17,20', os='ubuntu-20.04', arch='s390x', add_llvm=True), job(compiler='gcc-11', cxxstd='11,14,17,20', os='ubuntu-20.04', arch='s390x'), diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2d3dab1..94922acd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,8 +43,8 @@ jobs: matrix: include: # Linux, gcc - - { compiler: gcc-4.4, cxxstd: '98,0x', os: ubuntu-latest, container: 'ubuntu:16.04' } - - { compiler: gcc-4.6, cxxstd: '0x', os: ubuntu-latest, container: 'ubuntu:16.04' } + - { compiler: gcc-4.4, cxxstd: '98,0x', os: ubuntu-latest, container: 'ubuntu:16.04', source_keys: '0x1E9377A2BA9EF27F', sources: 'ppa:ubuntu-toolchain-r/test' } + - { compiler: gcc-4.6, cxxstd: '0x', os: ubuntu-latest, container: 'ubuntu:16.04', source_keys: '0x1E9377A2BA9EF27F', sources: 'ppa:ubuntu-toolchain-r/test' } - { compiler: gcc-4.7, cxxstd: '11', os: ubuntu-latest, container: 'ubuntu:16.04' } - { compiler: gcc-4.8, cxxstd: '11', os: ubuntu-latest, container: 'ubuntu:16.04' } - { compiler: gcc-4.9, cxxstd: '11', os: ubuntu-latest, container: 'ubuntu:16.04' } @@ -61,7 +61,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: '2b', os: ubuntu-24.04, install: 'g++-13-multilib', address-model: '32,64' } + compiler: gcc-13, cxxstd: '2b', os: ubuntu-24.04, install: 'g++-13-multilib gcc-multilib', address-model: '32,64' } # Linux, clang - { compiler: clang-3.5, cxxstd: '11', os: ubuntu-latest, container: 'ubuntu:16.04' }