From 30e4be0d1bffab861652769a0a34c9dd975aced7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 17 May 2023 09:47:35 -0400 Subject: ci: Use distro packaged clang-tidy headers in Fedora base image Since commit 703f39354e (ci: add clang-tidy development headers to Fedora base image, 2022-08-31, v3.25.0-rc1~215^2), Fedora has added the `clang-tools-extra-devel` package. --- .gitlab/ci/docker/fedora37/Dockerfile | 17 +---------------- .../docker/fedora37/clang_tidy_headers_packages.lst | 4 ---- .gitlab/ci/docker/fedora37/deps_packages.lst | 1 + .../ci/docker/fedora37/install_clang_tidy_headers.sh | 20 -------------------- 4 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 .gitlab/ci/docker/fedora37/clang_tidy_headers_packages.lst delete mode 100755 .gitlab/ci/docker/fedora37/install_clang_tidy_headers.sh diff --git a/.gitlab/ci/docker/fedora37/Dockerfile b/.gitlab/ci/docker/fedora37/Dockerfile index b36a17e..5439e9d 100644 --- a/.gitlab/ci/docker/fedora37/Dockerfile +++ b/.gitlab/ci/docker/fedora37/Dockerfile @@ -4,8 +4,7 @@ ARG BASE_IMAGE=fedora:37 FROM ${BASE_IMAGE} AS dnf-cache # Populate DNF cache w/ the fresh metadata and prefetch packages. -RUN --mount=type=bind,source=clang_tidy_headers_packages.lst,target=/root/clang_tidy_headers_packages.lst \ - --mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \ +RUN --mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \ --mount=type=bind,source=iwyu_packages.lst,target=/root/iwyu_packages.lst \ --mount=type=bind,source=rvm_packages.lst,target=/root/rvm_packages.lst \ --mount=type=tmpfs,target=/var/log \ @@ -30,17 +29,6 @@ RUN --mount=type=bind,source=install_rvm.sh,target=/root/install_rvm.sh \ sh /root/install_rvm.sh -FROM ${BASE_IMAGE} AS clang-tidy-headers -LABEL maintainer="Kyle Edwards " - -RUN --mount=type=bind,source=install_clang_tidy_headers.sh,target=/root/install_clang_tidy_headers.sh \ - --mount=type=bind,source=clang_tidy_headers_packages.lst,target=/root/clang_tidy_headers_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/cache/dnf,target=/var/cache/dnf,sharing=private \ - --mount=type=tmpfs,target=/var/log \ - --mount=type=tmpfs,target=/tmp \ - sh /root/install_clang_tidy_headers.sh - - FROM ${BASE_IMAGE} AS iwyu-build LABEL maintainer="Kyle Edwards " @@ -66,8 +54,5 @@ RUN --mount=type=bind,source=install_deps.sh,target=/root/install_deps.sh \ RUN --mount=type=bind,from=rvm-build,source=/root,target=/root \ tar -C /usr/local -xf /root/rvm.tar -RUN --mount=type=bind,from=clang-tidy-headers,source=/root,target=/root \ - tar -C /usr/include -xf /root/clang-tidy-headers.tar - RUN --mount=type=bind,from=iwyu-build,source=/root,target=/root \ tar -C / -xf /root/iwyu.tar diff --git a/.gitlab/ci/docker/fedora37/clang_tidy_headers_packages.lst b/.gitlab/ci/docker/fedora37/clang_tidy_headers_packages.lst deleted file mode 100644 index fe86105..0000000 --- a/.gitlab/ci/docker/fedora37/clang_tidy_headers_packages.lst +++ /dev/null @@ -1,4 +0,0 @@ -dnf-command(download) -rpm-build -python3-devel -clang-tools-extra diff --git a/.gitlab/ci/docker/fedora37/deps_packages.lst b/.gitlab/ci/docker/fedora37/deps_packages.lst index 51f84ff..c7c1385 100644 --- a/.gitlab/ci/docker/fedora37/deps_packages.lst +++ b/.gitlab/ci/docker/fedora37/deps_packages.lst @@ -7,6 +7,7 @@ qt6-qtbase-devel # Install development tools. clang clang-tools-extra +clang-tools-extra-devel compiler-rt flang flang-devel diff --git a/.gitlab/ci/docker/fedora37/install_clang_tidy_headers.sh b/.gitlab/ci/docker/fedora37/install_clang_tidy_headers.sh deleted file mode 100755 index 200fa1e..0000000 --- a/.gitlab/ci/docker/fedora37/install_clang_tidy_headers.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -# Packages for building the clang-tidy plugin. -# TODO: Upstream this as a proper Fedora package. -dnf install \ - --setopt=install_weak_deps=False \ - --setopt=fastestmirror=True \ - --setopt=max_parallel_downloads=10 \ - -y \ - $(grep '^[^#]\+$' /root/clang_tidy_headers_packages.lst) - -clang_source_rpm=$(rpm -q --queryformat '%{SOURCERPM}' clang-tools-extra) -clang_version=$(rpm -q --queryformat '%{VERSION}' clang-tools-extra) -dnf download --source -y clang -rpm -i "$clang_source_rpm" -rpmbuild -bp /root/rpmbuild/SPECS/clang.spec -cd "/root/rpmbuild/BUILD/clang-tools-extra-$clang_version.src" -find clang-tidy -name '*.h' | tar -cf /root/clang-tidy-headers.tar -T - -- cgit v0.12 From f24c6ae5b8dc817a80ce8989991b13ca03641089 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 17 May 2023 09:50:24 -0400 Subject: ci: Add nlohmann-json to Fedora base image We need version 3.11.2 or higher, which Debian 10 does not package, so leave it out of the Debian base images. --- .gitlab/ci/docker/fedora37/deps_packages.lst | 1 + .gitlab/os-linux.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab/ci/docker/fedora37/deps_packages.lst b/.gitlab/ci/docker/fedora37/deps_packages.lst index c7c1385..68777f0 100644 --- a/.gitlab/ci/docker/fedora37/deps_packages.lst +++ b/.gitlab/ci/docker/fedora37/deps_packages.lst @@ -19,6 +19,7 @@ make bzip2-devel expat-devel jsoncpp-devel +json-devel libarchive-devel libcurl-devel libuv-devel diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 3d62b01..4ac7772 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -69,7 +69,7 @@ ### Fedora .fedora37: - image: "kitware/cmake:ci-fedora37-x86_64-2023-03-29" + image: "kitware/cmake:ci-fedora37-x86_64-2023-05-17" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" -- cgit v0.12