Update drone jobs after PPA removal

boostorg · Dec 19, 2024 · 28d61a4 · 28d61a4
1 parent 6367d04
commit 28d61a4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git 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,10 +99,10 @@ 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'),
+    job(compiler='gcc-11',    cxxstd='11,14,17,20',    os='ubuntu-22.04', arch='s390x'),
     # Windows
     job(compiler='msvc-14.0', cxxstd=None,              os='windows', env={'B2_DONT_EMBED_MANIFEST': 1}),
     job(compiler='msvc-14.1', cxxstd=None,              os='windows'),

diff --git 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' }