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
This commit is contained in:
Brad King
2022-09-29 11:16:27 -04:00
parent cadcb6a5f0
commit 9c8c965435
3 changed files with 1 additions and 25 deletions

View File

@@ -16,9 +16,6 @@ MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
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

View File

@@ -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

View File

@@ -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"