Jelajahi Sumber

ci: update Fedora base images to Fedora 42

Brad King 8 bulan lalu
induk
melakukan
efa818f661

+ 1 - 1
.gitlab/ci/docker/fedora41-hip/Dockerfile → .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 <[email protected]>"

+ 1 - 0
.gitlab/ci/docker/fedora41-hip/deps_packages.lst → .gitlab/ci/docker/fedora42-hip/deps_packages.lst

@@ -13,3 +13,4 @@ llvm
 rocm-comgr-devel
 rocm-hip-devel
 rocm-runtime-devel
+rocminfo

+ 0 - 0
.gitlab/ci/docker/fedora41-hip/dnf.conf → .gitlab/ci/docker/fedora42-hip/dnf.conf


+ 2 - 2
.gitlab/ci/docker/fedora41/Dockerfile → .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

+ 0 - 0
.gitlab/ci/docker/fedora41/build_iwyu.sh → .gitlab/ci/docker/fedora42/build_iwyu.sh


+ 1 - 1
.gitlab/ci/docker/fedora41/build_rbenv.sh → .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 <<EOF >/tmp/exclude.lst
 *LICENSE*

+ 0 - 0
.gitlab/ci/docker/fedora41/build_rust.sh → .gitlab/ci/docker/fedora42/build_rust.sh


+ 1 - 1
.gitlab/ci/docker/fedora41/build_rvm.sh → .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

+ 1 - 1
.gitlab/ci/docker/fedora41/deps_packages.lst → .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

+ 0 - 0
.gitlab/ci/docker/fedora41/dnf.conf → .gitlab/ci/docker/fedora42/dnf.conf


+ 0 - 0
.gitlab/ci/docker/fedora41/install_deps.sh → .gitlab/ci/docker/fedora42/install_deps.sh


+ 0 - 0
.gitlab/ci/docker/fedora41/iwyu_packages.lst → .gitlab/ci/docker/fedora42/iwyu_packages.lst


+ 0 - 0
.gitlab/ci/docker/fedora41/rbenv_packages.lst → .gitlab/ci/docker/fedora42/rbenv_packages.lst


+ 0 - 0
.gitlab/ci/docker/fedora41/rust_packages.lst → .gitlab/ci/docker/fedora42/rust_packages.lst


+ 1 - 0
.gitlab/ci/docker/fedora41/rvm_packages.lst → .gitlab/ci/docker/fedora42/rvm_packages.lst

@@ -3,6 +3,7 @@ automake
 bison
 bzip2
 findutils
+gawk
 gcc-c++
 glibc-devel
 gnupg2

+ 1 - 1
.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")