[CI] Avoid having to rebuild msys images when updating clang/llvm

glandium · Oct 10, 2023 · eb208cc · eb208cc
1 parent 26249b5
commit eb208cc
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/CI/docker.py b/CI/docker.py
@@ -31,6 +31,13 @@ def sources_list(snapshot, sections):
         )
 
 
+LLVM_REPO = (
+    'echo'
+    ' deb [signed-by=/usr/share/keyrings/llvm.gpg]'
+    ' https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-17 main'
+    ' > /etc/apt/sources.list.d/llvm.list',
+)
+
 DOCKER_IMAGES = {
     'base': {
         'from': 'debian:bullseye-20220801',
@@ -62,10 +69,6 @@ def sources_list(snapshot, sections):
             'gpg --no-default-keyring --keyring /usr/share/keyrings/llvm.gpg'
             ' --import llvm-snapshot.gpg.key',
             'rm llvm-snapshot.gpg.key',
-            'echo'
-            ' deb [signed-by=/usr/share/keyrings/llvm.gpg]'
-            ' https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-17 main'
-            ' > /etc/apt/sources.list.d/llvm.list',
             'apt-get update -o Acquire::Check-Valid-Until=false',
             'curl -sO http://snapshot.debian.org/archive/debian'
             '/20220326T025251Z/pool/main/p/python2-pip'
@@ -81,6 +84,7 @@ def sources_list(snapshot, sections):
     'build': {
         'from': 'base',
         'commands': [
+            LLVM_REPO,
             'apt-get update -o Acquire::Check-Valid-Until=false',
             'apt-get install -y --no-install-recommends {}'.format(' '.join([
                 'clang-17',
@@ -153,6 +157,7 @@ def sources_list(snapshot, sections):
     'test': {
         'from': 'base',
         'commands': [
+            LLVM_REPO,
             'apt-get install -y --no-install-recommends {}'.format(' '.join([
                 'llvm-17',
                 'make',