From fa875574b73618daf3bc70e6ff4d342493fa11d9 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Tue, 21 Feb 2023 16:55:38 +0000 Subject: [PATCH 01/13] automation: Remove clang-8 from Debian unstable container First, apt complain that it isn't the right way to add keys anymore, but hopefully that's just a warning. Second, we can't install clang-8: The following packages have unmet dependencies: clang-8 : Depends: libstdc++-8-dev but it is not installable Depends: libgcc-8-dev but it is not installable Depends: libobjc-8-dev but it is not installable Recommends: llvm-8-dev but it is not going to be installed Recommends: libomp-8-dev but it is not going to be installed libllvm8 : Depends: libffi7 (>= 3.3~20180313) but it is not installable E: Unable to correct problems, you have held broken packages. clang on Debian unstable is now version 14.0.6. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper (cherry picked from commit a6b1e2b80fe2053b1c9c9843fb086a668513ea36) --- automation/build/debian/unstable-llvm-8.list | 3 --- automation/build/debian/unstable.dockerfile | 12 ------------ automation/gitlab-ci/build.yaml | 10 ---------- 3 files changed, 25 deletions(-) delete mode 100644 automation/build/debian/unstable-llvm-8.list diff --git a/automation/build/debian/unstable-llvm-8.list b/automation/build/debian/unstable-llvm-8.list deleted file mode 100644 index dc119fa0b4..0000000000 --- a/automation/build/debian/unstable-llvm-8.list +++ /dev/null @@ -1,3 +0,0 @@ -# Unstable LLVM 8 repos -deb http://apt.llvm.org/unstable/ llvm-toolchain-8 main -deb-src http://apt.llvm.org/unstable/ llvm-toolchain-8 main diff --git a/automation/build/debian/unstable.dockerfile b/automation/build/debian/unstable.dockerfile index 9a10ee08d6..1200245c9b 100644 --- a/automation/build/debian/unstable.dockerfile +++ b/automation/build/debian/unstable.dockerfile @@ -51,15 +51,3 @@ RUN apt-get update && \ apt-get autoremove -y && \ apt-get clean && \ rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* - -RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|apt-key add - -COPY unstable-llvm-8.list /etc/apt/sources.list.d/ - -RUN apt-get update && \ - apt-get --quiet --yes install \ - clang-8 \ - lld-8 \ - && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 23ab81d892..6cca2122aa 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -276,16 +276,6 @@ debian-unstable-clang-debug: variables: CONTAINER: debian:unstable -debian-unstable-clang-8: - extends: .clang-8-x86-64-build - variables: - CONTAINER: debian:unstable - -debian-unstable-clang-8-debug: - extends: .clang-8-x86-64-build-debug - variables: - CONTAINER: debian:unstable - debian-unstable-gcc: extends: .gcc-x86-64-build variables: -- 2.40.0