Skip to content

Commit fa6970b

Browse files
committed
Update OS configs after toolchain PPA removal
1 parent 2dadb1e commit fa6970b

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.drone.star

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def main(ctx):
9999
job(compiler='clang', cxxstd='11,14,17,20,2b', os='osx-xcode-15.0.1'),
100100
# ARM64
101101
job(compiler='clang-12', cxxstd='11,14,17,20', os='ubuntu-20.04', arch='arm64', add_llvm=True),
102-
job(compiler='gcc-11', cxxstd='11,14,17,20', os='ubuntu-20.04', arch='arm64'),
102+
job(compiler='gcc-11', cxxstd='11,14,17,20', os='ubuntu-22.04', arch='arm64'),
103103
# S390x
104104
job(compiler='clang-12', cxxstd='11,14,17,20', os='ubuntu-20.04', arch='s390x', add_llvm=True),
105105
job(compiler='gcc-11', cxxstd='11,14,17,20', os='ubuntu-20.04', arch='s390x'),

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ jobs:
4343
matrix:
4444
include:
4545
# Linux, gcc
46-
- { compiler: gcc-4.4, cxxstd: '98,0x', os: ubuntu-latest, container: 'ubuntu:16.04' }
47-
- { compiler: gcc-4.6, cxxstd: '0x', os: ubuntu-latest, container: 'ubuntu:16.04' }
46+
- { compiler: gcc-4.4, cxxstd: '98,0x', os: ubuntu-latest, container: 'ubuntu:16.04', source_keys: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x1E9377A2BA9EF27F', sources: 'ppa:ubuntu-toolchain-r/test' }
47+
- { compiler: gcc-4.6, cxxstd: '0x', os: ubuntu-latest, container: 'ubuntu:16.04', source_keys: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x1E9377A2BA9EF27F', sources: 'ppa:ubuntu-toolchain-r/test' }
4848
- { compiler: gcc-4.7, cxxstd: '11', os: ubuntu-latest, container: 'ubuntu:16.04' }
4949
- { compiler: gcc-4.8, cxxstd: '11', os: ubuntu-latest, container: 'ubuntu:16.04' }
5050
- { compiler: gcc-4.9, cxxstd: '11', os: ubuntu-latest, container: 'ubuntu:16.04' }
@@ -61,7 +61,7 @@ jobs:
6161
- { name: GCC w/ sanitizers, sanitize: yes,
6262
compiler: gcc-13, cxxstd: '11,14,17,20', os: ubuntu-24.04 }
6363
- { name: Collect coverage, coverage: yes,
64-
compiler: gcc-13, cxxstd: '2b', os: ubuntu-24.04, install: 'g++-13-multilib', address-model: '32,64' }
64+
compiler: gcc-13, cxxstd: '2b', os: ubuntu-24.04, install: 'g++-13-multilib gcc-13-multilib', address-model: '32,64' }
6565

6666
# Linux, clang
6767
- { compiler: clang-3.5, cxxstd: '11', os: ubuntu-latest, container: 'ubuntu:16.04' }

0 commit comments

Comments
 (0)