From efa818f66111feb9a9651bd6cad775ca6e4e0a4c Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 22 Apr 2025 11:51:06 -0400 Subject: [PATCH] ci: update Fedora base images to Fedora 42 --- .gitlab/ci/docker/{fedora41-hip => fedora42-hip}/Dockerfile | 2 +- .../docker/{fedora41-hip => fedora42-hip}/deps_packages.lst | 1 + .gitlab/ci/docker/{fedora41-hip => fedora42-hip}/dnf.conf | 0 .gitlab/ci/docker/{fedora41 => fedora42}/Dockerfile | 4 ++-- .gitlab/ci/docker/{fedora41 => fedora42}/build_iwyu.sh | 0 .gitlab/ci/docker/{fedora41 => fedora42}/build_rbenv.sh | 2 +- .gitlab/ci/docker/{fedora41 => fedora42}/build_rust.sh | 0 .gitlab/ci/docker/{fedora41 => fedora42}/build_rvm.sh | 2 +- .gitlab/ci/docker/{fedora41 => fedora42}/deps_packages.lst | 2 +- .gitlab/ci/docker/{fedora41 => fedora42}/dnf.conf | 0 .gitlab/ci/docker/{fedora41 => fedora42}/install_deps.sh | 0 .gitlab/ci/docker/{fedora41 => fedora42}/iwyu_packages.lst | 0 .gitlab/ci/docker/{fedora41 => fedora42}/rbenv_packages.lst | 0 .gitlab/ci/docker/{fedora41 => fedora42}/rust_packages.lst | 0 .gitlab/ci/docker/{fedora41 => fedora42}/rvm_packages.lst | 1 + .gitlab/ci/env_fedora41_makefiles.cmake | 2 +- 16 files changed, 9 insertions(+), 7 deletions(-) rename .gitlab/ci/docker/{fedora41-hip => fedora42-hip}/Dockerfile (94%) rename .gitlab/ci/docker/{fedora41-hip => fedora42-hip}/deps_packages.lst (95%) rename .gitlab/ci/docker/{fedora41-hip => fedora42-hip}/dnf.conf (100%) rename .gitlab/ci/docker/{fedora41 => fedora42}/Dockerfile (98%) rename .gitlab/ci/docker/{fedora41 => fedora42}/build_iwyu.sh (100%) rename .gitlab/ci/docker/{fedora41 => fedora42}/build_rbenv.sh (93%) rename .gitlab/ci/docker/{fedora41 => fedora42}/build_rust.sh (100%) rename .gitlab/ci/docker/{fedora41 => fedora42}/build_rvm.sh (92%) rename .gitlab/ci/docker/{fedora41 => fedora42}/deps_packages.lst (98%) rename .gitlab/ci/docker/{fedora41 => fedora42}/dnf.conf (100%) rename .gitlab/ci/docker/{fedora41 => fedora42}/install_deps.sh (100%) rename .gitlab/ci/docker/{fedora41 => fedora42}/iwyu_packages.lst (100%) rename .gitlab/ci/docker/{fedora41 => fedora42}/rbenv_packages.lst (100%) rename .gitlab/ci/docker/{fedora41 => fedora42}/rust_packages.lst (100%) rename .gitlab/ci/docker/{fedora41 => fedora42}/rvm_packages.lst (97%) diff --git a/.gitlab/ci/docker/fedora41-hip/Dockerfile b/.gitlab/ci/docker/fedora42-hip/Dockerfile similarity index 94% rename from .gitlab/ci/docker/fedora41-hip/Dockerfile rename to .gitlab/ci/docker/fedora42-hip/Dockerfile index ac7a0ff305..22e5e2f8dd 100644 --- a/.gitlab/ci/docker/fedora41-hip/Dockerfile +++ b/.gitlab/ci/docker/fedora42-hip/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG BASE_IMAGE=fedora:41 +ARG BASE_IMAGE=fedora:42 FROM ${BASE_IMAGE} AS dnf-cache LABEL maintainer="Brad King " diff --git a/.gitlab/ci/docker/fedora41-hip/deps_packages.lst b/.gitlab/ci/docker/fedora42-hip/deps_packages.lst similarity index 95% rename from .gitlab/ci/docker/fedora41-hip/deps_packages.lst rename to .gitlab/ci/docker/fedora42-hip/deps_packages.lst index 70b114c403..abae13adc7 100644 --- a/.gitlab/ci/docker/fedora41-hip/deps_packages.lst +++ b/.gitlab/ci/docker/fedora42-hip/deps_packages.lst @@ -13,3 +13,4 @@ llvm rocm-comgr-devel rocm-hip-devel rocm-runtime-devel +rocminfo diff --git a/.gitlab/ci/docker/fedora41-hip/dnf.conf b/.gitlab/ci/docker/fedora42-hip/dnf.conf similarity index 100% rename from .gitlab/ci/docker/fedora41-hip/dnf.conf rename to .gitlab/ci/docker/fedora42-hip/dnf.conf diff --git a/.gitlab/ci/docker/fedora41/Dockerfile b/.gitlab/ci/docker/fedora42/Dockerfile similarity index 98% rename from .gitlab/ci/docker/fedora41/Dockerfile rename to .gitlab/ci/docker/fedora42/Dockerfile index 67bcbbc5d3..e78b76b4be 100644 --- a/.gitlab/ci/docker/fedora41/Dockerfile +++ b/.gitlab/ci/docker/fedora42/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG BASE_IMAGE=fedora:41 +ARG BASE_IMAGE=fedora:42 FROM ${BASE_IMAGE} AS dnf-cache # Populate DNF cache w/ the fresh metadata and prefetch packages. @@ -132,4 +132,4 @@ RUN --mount=type=bind,from=rvm-build,source=/root,target=/root \ tar -C /usr/local -xf /root/rvm.tar RUN --mount=type=bind,from=rbenv-build,source=/root,target=/root \ - tar -C / -xf /root/rbenv.tar && rbenv global 3.1.2 + tar -C / -xf /root/rbenv.tar && rbenv global 3.4.3 diff --git a/.gitlab/ci/docker/fedora41/build_iwyu.sh b/.gitlab/ci/docker/fedora42/build_iwyu.sh similarity index 100% rename from .gitlab/ci/docker/fedora41/build_iwyu.sh rename to .gitlab/ci/docker/fedora42/build_iwyu.sh diff --git a/.gitlab/ci/docker/fedora41/build_rbenv.sh b/.gitlab/ci/docker/fedora42/build_rbenv.sh similarity index 93% rename from .gitlab/ci/docker/fedora41/build_rbenv.sh rename to .gitlab/ci/docker/fedora42/build_rbenv.sh index 3ed0033a91..feb574fe5f 100755 --- a/.gitlab/ci/docker/fedora41/build_rbenv.sh +++ b/.gitlab/ci/docker/fedora42/build_rbenv.sh @@ -7,7 +7,7 @@ echo "gem: --no-document" > ~/.gemrc # Ruby rbenv export RUBY_CONFIGURE_OPTS=--disable-install-doc export RUBY_BUILD_CURL_OPTS=-C- -rbenv install 3.1.2 -k -s -v +rbenv install 3.4.3 -k -s -v cat </tmp/exclude.lst *LICENSE* diff --git a/.gitlab/ci/docker/fedora41/build_rust.sh b/.gitlab/ci/docker/fedora42/build_rust.sh similarity index 100% rename from .gitlab/ci/docker/fedora41/build_rust.sh rename to .gitlab/ci/docker/fedora42/build_rust.sh diff --git a/.gitlab/ci/docker/fedora41/build_rvm.sh b/.gitlab/ci/docker/fedora42/build_rvm.sh similarity index 92% rename from .gitlab/ci/docker/fedora41/build_rvm.sh rename to .gitlab/ci/docker/fedora42/build_rvm.sh index a62e9a76d5..22c4333e4c 100755 --- a/.gitlab/ci/docker/fedora41/build_rvm.sh +++ b/.gitlab/ci/docker/fedora42/build_rvm.sh @@ -13,7 +13,7 @@ curl -sSL https://get.rvm.io | bash -s stable --ignore-dotfiles export rvm_silence_banner=1 # keep version in sync with `env_fedora*_makefiles.cmake` -/usr/local/rvm/bin/rvm install ruby-3.0.4 --no-docs --disable-binary +/usr/local/rvm/bin/rvm install ruby-3.3.8 --no-docs --disable-binary for p in archives docs examples gem-cache log src; do touch /usr/local/rvm/${p}/.tar_exclude diff --git a/.gitlab/ci/docker/fedora41/deps_packages.lst b/.gitlab/ci/docker/fedora42/deps_packages.lst similarity index 98% rename from .gitlab/ci/docker/fedora41/deps_packages.lst rename to .gitlab/ci/docker/fedora42/deps_packages.lst index 3005c3cd97..56825142f5 100644 --- a/.gitlab/ci/docker/fedora41/deps_packages.lst +++ b/.gitlab/ci/docker/fedora42/deps_packages.lst @@ -89,7 +89,7 @@ hdf5-mpich-devel hdf5-openmpi-devel ImageMagick-c++-devel jasper-devel -java-11-openjdk-devel +java-21-openjdk-devel jsoncpp-devel lapack-devel libarchive-devel diff --git a/.gitlab/ci/docker/fedora41/dnf.conf b/.gitlab/ci/docker/fedora42/dnf.conf similarity index 100% rename from .gitlab/ci/docker/fedora41/dnf.conf rename to .gitlab/ci/docker/fedora42/dnf.conf diff --git a/.gitlab/ci/docker/fedora41/install_deps.sh b/.gitlab/ci/docker/fedora42/install_deps.sh similarity index 100% rename from .gitlab/ci/docker/fedora41/install_deps.sh rename to .gitlab/ci/docker/fedora42/install_deps.sh diff --git a/.gitlab/ci/docker/fedora41/iwyu_packages.lst b/.gitlab/ci/docker/fedora42/iwyu_packages.lst similarity index 100% rename from .gitlab/ci/docker/fedora41/iwyu_packages.lst rename to .gitlab/ci/docker/fedora42/iwyu_packages.lst diff --git a/.gitlab/ci/docker/fedora41/rbenv_packages.lst b/.gitlab/ci/docker/fedora42/rbenv_packages.lst similarity index 100% rename from .gitlab/ci/docker/fedora41/rbenv_packages.lst rename to .gitlab/ci/docker/fedora42/rbenv_packages.lst diff --git a/.gitlab/ci/docker/fedora41/rust_packages.lst b/.gitlab/ci/docker/fedora42/rust_packages.lst similarity index 100% rename from .gitlab/ci/docker/fedora41/rust_packages.lst rename to .gitlab/ci/docker/fedora42/rust_packages.lst diff --git a/.gitlab/ci/docker/fedora41/rvm_packages.lst b/.gitlab/ci/docker/fedora42/rvm_packages.lst similarity index 97% rename from .gitlab/ci/docker/fedora41/rvm_packages.lst rename to .gitlab/ci/docker/fedora42/rvm_packages.lst index dc9f9812e9..3ab692c47f 100644 --- a/.gitlab/ci/docker/fedora41/rvm_packages.lst +++ b/.gitlab/ci/docker/fedora42/rvm_packages.lst @@ -3,6 +3,7 @@ automake bison bzip2 findutils +gawk gcc-c++ glibc-devel gnupg2 diff --git a/.gitlab/ci/env_fedora41_makefiles.cmake b/.gitlab/ci/env_fedora41_makefiles.cmake index ef13cda7b5..722c10ea16 100644 --- a/.gitlab/ci/env_fedora41_makefiles.cmake +++ b/.gitlab/ci/env_fedora41_makefiles.cmake @@ -1 +1 @@ -set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-3.0.4") +set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-3.3.8")