For similar reasons to c/s a6b1e2b80fe20. While this container is still build-able, all the other problems with explicitly-versioned compilers remain.
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com> --- CC: Anthony PERARD <anthony.per...@citrix.com> CC: Stefano Stabellini <sstabell...@kernel.org> CC: Michal Orzel <michal.or...@amd.com> CC: Doug Goldstein <car...@cardoe.com> This will require backporting to older trees, but there's already a list it can be added too. --- automation/build/debian/stretch-llvm-8.list | 3 --- automation/build/debian/stretch.dockerfile | 12 --------- automation/gitlab-ci/build.yaml | 27 --------------------- 3 files changed, 42 deletions(-) delete mode 100644 automation/build/debian/stretch-llvm-8.list diff --git a/automation/build/debian/stretch-llvm-8.list b/automation/build/debian/stretch-llvm-8.list deleted file mode 100644 index 590001ca81e8..000000000000 --- a/automation/build/debian/stretch-llvm-8.list +++ /dev/null @@ -1,3 +0,0 @@ -# Strech LLVM 8 repos -deb https://apt.llvm.org/stretch/ llvm-toolchain-stretch-8 main -deb-src https://apt.llvm.org/stretch/ llvm-toolchain-stretch-8 main diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile index 2c086b197cba..1af6c691f8f4 100644 --- a/automation/build/debian/stretch.dockerfile +++ b/automation/build/debian/stretch.dockerfile @@ -54,15 +54,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 stretch-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 820cc0af83bd..3547aa419097 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -28,13 +28,6 @@ CXX: clang++ clang: y -.clang-8-tmpl: - variables: &clang-8 - CC: clang-8 - CXX: clang++-8 - LD: ld.lld-8 - clang: y - .x86-64-build-tmpl: <<: *build variables: @@ -99,16 +92,6 @@ variables: <<: *clang -.clang-8-x86-64-build: - extends: .x86-64-build - variables: - <<: *clang-8 - -.clang-8-x86-64-build-debug: - extends: .x86-64-build-debug - variables: - <<: *clang-8 - .clang-x86-32-build: extends: .x86-32-build variables: @@ -285,16 +268,6 @@ debian-stretch-clang-debug: variables: CONTAINER: debian:stretch -debian-stretch-clang-8: - extends: .clang-8-x86-64-build - variables: - CONTAINER: debian:stretch - -debian-stretch-clang-8-debug: - extends: .clang-8-x86-64-build-debug - variables: - CONTAINER: debian:stretch - debian-stretch-gcc: extends: .gcc-x86-64-build variables: -- 2.30.2
