From 46d89b8524f4fa0215985911abbdfee9d8df6269 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Oct 2024 13:00:10 -0400 Subject: [PATCH] ci: update Linux image to Fedora 41 --- .gitlab/ci/docker/{fedora40 => fedora41}/Dockerfile | 8 ++++---- .../docker/{fedora40 => fedora41}/deps_packages.lst | 1 - .../docker/{fedora40 => fedora41}/install_deps.sh | 13 ++----------- .../docker/{fedora40 => fedora41}/install_iwyu.sh | 4 +++- .../ci/docker/{fedora40 => fedora41}/install_rvm.sh | 0 .../docker/{fedora40 => fedora41}/iwyu_packages.lst | 0 .../docker/{fedora40 => fedora41}/rvm_packages.lst | 1 + 7 files changed, 10 insertions(+), 17 deletions(-) rename .gitlab/ci/docker/{fedora40 => fedora41}/Dockerfile (85%) rename .gitlab/ci/docker/{fedora40 => fedora41}/deps_packages.lst (98%) rename .gitlab/ci/docker/{fedora40 => fedora41}/install_deps.sh (58%) rename .gitlab/ci/docker/{fedora40 => fedora41}/install_iwyu.sh (89%) rename .gitlab/ci/docker/{fedora40 => fedora41}/install_rvm.sh (100%) rename .gitlab/ci/docker/{fedora40 => fedora41}/iwyu_packages.lst (100%) rename .gitlab/ci/docker/{fedora40 => fedora41}/rvm_packages.lst (96%) diff --git a/.gitlab/ci/docker/fedora40/Dockerfile b/.gitlab/ci/docker/fedora41/Dockerfile similarity index 85% rename from .gitlab/ci/docker/fedora40/Dockerfile rename to .gitlab/ci/docker/fedora41/Dockerfile index 896456c84b..ed7daa7640 100644 --- a/.gitlab/ci/docker/fedora40/Dockerfile +++ b/.gitlab/ci/docker/fedora41/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG BASE_IMAGE=fedora:40 +ARG BASE_IMAGE=fedora:41 FROM ${BASE_IMAGE} AS dnf-cache # Populate DNF cache w/ the fresh metadata and prefetch packages. @@ -23,7 +23,7 @@ LABEL maintainer="Ben Boeckel " RUN --mount=type=bind,source=install_rvm.sh,target=/root/install_rvm.sh \ --mount=type=bind,source=rvm_packages.lst,target=/root/rvm_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/cache/dnf,target=/var/cache/dnf,sharing=private \ + --mount=type=cache,from=dnf-cache,source=/var/lib/dnf,target=/var/lib/dnf,sharing=private \ --mount=type=tmpfs,target=/var/log \ --mount=type=tmpfs,target=/tmp \ sh /root/install_rvm.sh @@ -34,7 +34,7 @@ LABEL maintainer="Kyle Edwards " RUN --mount=type=bind,source=install_iwyu.sh,target=/root/install_iwyu.sh \ --mount=type=bind,source=iwyu_packages.lst,target=/root/iwyu_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/cache/dnf,target=/var/cache/dnf,sharing=private \ + --mount=type=cache,from=dnf-cache,source=/var/lib/dnf,target=/var/lib/dnf,sharing=private \ --mount=type=tmpfs,target=/var/log \ --mount=type=tmpfs,target=/tmp \ sh /root/install_iwyu.sh @@ -45,7 +45,7 @@ LABEL maintainer="Ben Boeckel " RUN --mount=type=bind,source=install_deps.sh,target=/root/install_deps.sh \ --mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/cache/dnf,target=/var/cache/dnf,sharing=private \ + --mount=type=cache,from=dnf-cache,source=/var/lib/dnf,target=/var/lib/dnf,sharing=private \ --mount=type=cache,target=/var/cache/pip \ --mount=type=tmpfs,target=/var/log \ --mount=type=tmpfs,target=/tmp \ diff --git a/.gitlab/ci/docker/fedora40/deps_packages.lst b/.gitlab/ci/docker/fedora41/deps_packages.lst similarity index 98% rename from .gitlab/ci/docker/fedora40/deps_packages.lst rename to .gitlab/ci/docker/fedora41/deps_packages.lst index 9fc0a5c460..13bb1d111a 100644 --- a/.gitlab/ci/docker/fedora40/deps_packages.lst +++ b/.gitlab/ci/docker/fedora41/deps_packages.lst @@ -109,7 +109,6 @@ perl protobuf-devel protobuf-c-devel protobuf-lite-devel pypy2 pypy2-devel pypy3 pypy3-devel -python2 python2-devel python3 python3-devel python3-numpy python3-jsmin python3-jsonschema ruby rubygems ruby-devel diff --git a/.gitlab/ci/docker/fedora40/install_deps.sh b/.gitlab/ci/docker/fedora41/install_deps.sh similarity index 58% rename from .gitlab/ci/docker/fedora40/install_deps.sh rename to .gitlab/ci/docker/fedora41/install_deps.sh index 70e229319a..72d0a3fa5c 100755 --- a/.gitlab/ci/docker/fedora40/install_deps.sh +++ b/.gitlab/ci/docker/fedora41/install_deps.sh @@ -9,22 +9,13 @@ dnf install \ -y \ $(grep '^[^#]\+$' /root/deps_packages.lst) -# Fedora no longer packages python2 numpy. -curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o - | python2 -pip2.7 install --disable-pip-version-check --no-input --no-compile --cache-dir /var/cache/pip numpy - -# Remove demos and Python2 tests -for p in Demo test; do - rm -rf /usr/lib64/python2.7/${p} -done - # Remove tests for numpy -for v in 2.7 3.12; do +for v in 3.13; do find /usr/lib64/python${v}/site-packages/numpy -type d -a -name tests -exec rm -rf {} + done # Remove some other packages tests -find /usr/lib64/python3.12/site-packages/breezy -type d -a -name tests -exec rm -rf {} + +find /usr/lib64/python3.13/site-packages/breezy -type d -a -name tests -exec rm -rf {} + # Perforce curl -L https://www.perforce.com/downloads/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz -o - \ diff --git a/.gitlab/ci/docker/fedora40/install_iwyu.sh b/.gitlab/ci/docker/fedora41/install_iwyu.sh similarity index 89% rename from .gitlab/ci/docker/fedora40/install_iwyu.sh rename to .gitlab/ci/docker/fedora41/install_iwyu.sh index 50ed612789..6e55bbf70a 100755 --- a/.gitlab/ci/docker/fedora40/install_iwyu.sh +++ b/.gitlab/ci/docker/fedora41/install_iwyu.sh @@ -15,7 +15,9 @@ git clone "https://github.com/include-what-you-use/include-what-you-use.git" cd include-what-you-use readonly llvm_full_version="$( clang --version | head -n1 | cut -d' ' -f3 )" readonly llvm_version="$( echo "$llvm_full_version" | cut -d. -f-1 )" -git checkout "clang_$llvm_version" +#FIXME(IWYU): Create clang_19 branch. +#git checkout "clang_$llvm_version" +git checkout d2d092919f2774b5463e236e1ee9d56fb46ceb60 # 2024-10-05 git apply <