diff options
| author | Brad King <brad.king@kitware.com> | 2022-09-23 12:47:24 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-23 12:47:34 (GMT) |
| commit | fa9a7ba82ce189f28d4b68d58136cf254668948f (patch) | |
| tree | 5703fd47c1b402159a3b982a1ebc46d341882066 | |
| parent | 87b9a31489c4251f3fb6a9b79da6156cdb1a1d64 (diff) | |
| parent | 0ac9ec47f6bb4da3bf6a99512fcb8edb993fc4f1 (diff) | |
| download | CMake-fa9a7ba82ce189f28d4b68d58136cf254668948f.zip CMake-fa9a7ba82ce189f28d4b68d58136cf254668948f.tar.gz CMake-fa9a7ba82ce189f28d4b68d58136cf254668948f.tar.bz2 | |
Merge topic 'ci-debian10-clang-tidy-headers'
0ac9ec47f6 ci: add clang-tidy to Debian x86_64 base image
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7699
| -rw-r--r-- | .gitlab/ci/docker/debian10/Dockerfile | 3 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/debian10/install_clang_tidy.sh | 21 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 2 |
3 files changed, 25 insertions, 1 deletions
diff --git a/.gitlab/ci/docker/debian10/Dockerfile b/.gitlab/ci/docker/debian10/Dockerfile index 34a4bf1..3ebee87 100644 --- a/.gitlab/ci/docker/debian10/Dockerfile +++ b/.gitlab/ci/docker/debian10/Dockerfile @@ -16,6 +16,9 @@ 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 diff --git a/.gitlab/ci/docker/debian10/install_clang_tidy.sh b/.gitlab/ci/docker/debian10/install_clang_tidy.sh new file mode 100755 index 0000000..1280f1e --- /dev/null +++ b/.gitlab/ci/docker/debian10/install_clang_tidy.sh @@ -0,0 +1,21 @@ +#!/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 a46ec22..6ac1995 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-08-30" + image: "kitware/cmake:ci-debian10-x86_64-2022-09-22" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" |