From 9c8c96543558d7d3e0a1065f5421b28f810a85ee Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 29 Sep 2022 11:16:27 -0400 Subject: ci: Revert "add clang-tidy to Debian x86_64 base image" Revert commit 0ac9ec47f6 (ci: add clang-tidy to Debian x86_64 base image, 2022-09-20). Our clang-tidy job runs under Fedora, and we need the plugin to compile there anyway, so lints like IWYU will best be done in the Fedora image. Issue: #23912 --- .gitlab/ci/docker/debian10/Dockerfile | 3 --- .gitlab/ci/docker/debian10/install_clang_tidy.sh | 21 --------------------- .gitlab/os-linux.yml | 2 +- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100755 .gitlab/ci/docker/debian10/install_clang_tidy.sh diff --git a/.gitlab/ci/docker/debian10/Dockerfile b/.gitlab/ci/docker/debian10/Dockerfile index 3ebee87..34a4bf1 100644 --- a/.gitlab/ci/docker/debian10/Dockerfile +++ b/.gitlab/ci/docker/debian10/Dockerfile @@ -16,9 +16,6 @@ MAINTAINER Ben Boeckel COPY install_deps.sh /root/install_deps.sh RUN sh /root/install_deps.sh -COPY install_clang_tidy.sh /root/install_clang_tidy.sh -RUN sh /root/install_clang_tidy.sh - COPY --from=iwyu-build /root/iwyu.tar.gz /root/iwyu.tar.gz RUN tar -C / -xf /root/iwyu.tar.gz RUN ln -s /usr/lib/llvm-6.0/bin/include-what-you-use /usr/bin/include-what-you-use-6.0 diff --git a/.gitlab/ci/docker/debian10/install_clang_tidy.sh b/.gitlab/ci/docker/debian10/install_clang_tidy.sh deleted file mode 100755 index 1280f1e..0000000 --- a/.gitlab/ci/docker/debian10/install_clang_tidy.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -set -e - -# clang-tidy headers -apt-get install -y \ - gnupg2 -GNUPGHOME=$(mktemp -d) -export GNUPGHOME -keyid=6084F3CF814B57C1CF12EFD515CF4D18AF4F7421 -gpg2 --keyserver hkps://keyserver.ubuntu.com --recv-keys "$keyid" -gpg2 -o /usr/share/keyrings/llvm.gpg --export "$keyid" -rm -rf "$GNUPGHOME" -unset GNUPGHOME -echo 'deb [signed-by=/usr/share/keyrings/llvm.gpg] http://apt.llvm.org/buster/ llvm-toolchain-buster-14 main' > /etc/apt/sources.list.d/llvm.list -apt-get update -apt-get install -y \ - clang-tidy-14 \ - libclang-14-dev - -apt-get clean diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 6ac1995..a46ec22 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -45,7 +45,7 @@ ### Debian .debian10: - image: "kitware/cmake:ci-debian10-x86_64-2022-09-22" + image: "kitware/cmake:ci-debian10-x86_64-2022-08-30" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" -- cgit v0.12