diff --git a/.gitlab/ci/docker/fedora43-hip/Dockerfile b/.gitlab/ci/docker/fedora44-hip/Dockerfile similarity index 94% rename from .gitlab/ci/docker/fedora43-hip/Dockerfile rename to .gitlab/ci/docker/fedora44-hip/Dockerfile index 0f0cbed957..463d19fdf3 100644 --- a/.gitlab/ci/docker/fedora43-hip/Dockerfile +++ b/.gitlab/ci/docker/fedora44-hip/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG BASE_IMAGE=fedora:43 +ARG BASE_IMAGE=fedora:44 FROM ${BASE_IMAGE} AS dnf-cache LABEL maintainer="Brad King " diff --git a/.gitlab/ci/docker/fedora43-hip/deps_packages.lst b/.gitlab/ci/docker/fedora44-hip/deps_packages.lst similarity index 93% rename from .gitlab/ci/docker/fedora43-hip/deps_packages.lst rename to .gitlab/ci/docker/fedora44-hip/deps_packages.lst index abae13adc7..bac9e5345d 100644 --- a/.gitlab/ci/docker/fedora43-hip/deps_packages.lst +++ b/.gitlab/ci/docker/fedora44-hip/deps_packages.lst @@ -7,7 +7,6 @@ git-core make # Install HIP language toolchain. -hsakmt-devel lld llvm rocm-comgr-devel diff --git a/.gitlab/ci/docker/fedora43-hip/dnf.conf b/.gitlab/ci/docker/fedora44-hip/dnf.conf similarity index 100% rename from .gitlab/ci/docker/fedora43-hip/dnf.conf rename to .gitlab/ci/docker/fedora44-hip/dnf.conf diff --git a/.gitlab/ci/docker/fedora43/Dockerfile b/.gitlab/ci/docker/fedora44/Dockerfile similarity index 98% rename from .gitlab/ci/docker/fedora43/Dockerfile rename to .gitlab/ci/docker/fedora44/Dockerfile index 86ee3b8bd6..d36ccc9e2c 100644 --- a/.gitlab/ci/docker/fedora43/Dockerfile +++ b/.gitlab/ci/docker/fedora44/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG BASE_IMAGE=fedora:43 +ARG BASE_IMAGE=fedora:44 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.4.3 + tar -C / -xf /root/rbenv.tar && rbenv global 3.4.9 diff --git a/.gitlab/ci/docker/fedora43/build_iwyu.sh b/.gitlab/ci/docker/fedora44/build_iwyu.sh similarity index 100% rename from .gitlab/ci/docker/fedora43/build_iwyu.sh rename to .gitlab/ci/docker/fedora44/build_iwyu.sh diff --git a/.gitlab/ci/docker/fedora43/build_rbenv.sh b/.gitlab/ci/docker/fedora44/build_rbenv.sh similarity index 93% rename from .gitlab/ci/docker/fedora43/build_rbenv.sh rename to .gitlab/ci/docker/fedora44/build_rbenv.sh index feb574fe5f..f5ddd06505 100755 --- a/.gitlab/ci/docker/fedora43/build_rbenv.sh +++ b/.gitlab/ci/docker/fedora44/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.4.3 -k -s -v +rbenv install 3.4.9 -k -s -v cat </tmp/exclude.lst *LICENSE* diff --git a/.gitlab/ci/docker/fedora43/build_rust.sh b/.gitlab/ci/docker/fedora44/build_rust.sh similarity index 88% rename from .gitlab/ci/docker/fedora43/build_rust.sh rename to .gitlab/ci/docker/fedora44/build_rust.sh index 5ab91f7c7d..1ee87eba1e 100755 --- a/.gitlab/ci/docker/fedora43/build_rust.sh +++ b/.gitlab/ci/docker/fedora44/build_rust.sh @@ -2,7 +2,7 @@ set -e -typos_version=1.44.0 +typos_version=1.45.2 cargo install --root /usr/local --version "$typos_version" typos-cli strip /usr/local/bin/typos diff --git a/.gitlab/ci/docker/fedora43/build_rvm.sh b/.gitlab/ci/docker/fedora44/build_rvm.sh similarity index 100% rename from .gitlab/ci/docker/fedora43/build_rvm.sh rename to .gitlab/ci/docker/fedora44/build_rvm.sh diff --git a/.gitlab/ci/docker/fedora43/deps_packages.lst b/.gitlab/ci/docker/fedora44/deps_packages.lst similarity index 98% rename from .gitlab/ci/docker/fedora43/deps_packages.lst rename to .gitlab/ci/docker/fedora44/deps_packages.lst index 143c296e54..b763bb7214 100644 --- a/.gitlab/ci/docker/fedora43/deps_packages.lst +++ b/.gitlab/ci/docker/fedora44/deps_packages.lst @@ -96,7 +96,7 @@ hdf5-mpich-devel hdf5-openmpi-devel ImageMagick-c++-devel jasper-devel -java-21-openjdk-devel +java-25-openjdk-devel jsoncpp-devel lapack-devel libarchive-devel diff --git a/.gitlab/ci/docker/fedora43/dnf.conf b/.gitlab/ci/docker/fedora44/dnf.conf similarity index 100% rename from .gitlab/ci/docker/fedora43/dnf.conf rename to .gitlab/ci/docker/fedora44/dnf.conf diff --git a/.gitlab/ci/docker/fedora43/install_deps.sh b/.gitlab/ci/docker/fedora44/install_deps.sh similarity index 100% rename from .gitlab/ci/docker/fedora43/install_deps.sh rename to .gitlab/ci/docker/fedora44/install_deps.sh diff --git a/.gitlab/ci/docker/fedora43/iwyu_packages.lst b/.gitlab/ci/docker/fedora44/iwyu_packages.lst similarity index 100% rename from .gitlab/ci/docker/fedora43/iwyu_packages.lst rename to .gitlab/ci/docker/fedora44/iwyu_packages.lst diff --git a/.gitlab/ci/docker/fedora43/rbenv_packages.lst b/.gitlab/ci/docker/fedora44/rbenv_packages.lst similarity index 93% rename from .gitlab/ci/docker/fedora43/rbenv_packages.lst rename to .gitlab/ci/docker/fedora44/rbenv_packages.lst index d16afff851..7cba990c7c 100644 --- a/.gitlab/ci/docker/fedora43/rbenv_packages.lst +++ b/.gitlab/ci/docker/fedora44/rbenv_packages.lst @@ -1,5 +1,6 @@ rbenv ruby-build-rbenv +ruby-build-ruby # Packages needed for `rbenv` # https://github.com/rbenv/ruby-build/wiki#fedora diff --git a/.gitlab/ci/docker/fedora43/rust_packages.lst b/.gitlab/ci/docker/fedora44/rust_packages.lst similarity index 100% rename from .gitlab/ci/docker/fedora43/rust_packages.lst rename to .gitlab/ci/docker/fedora44/rust_packages.lst diff --git a/.gitlab/ci/docker/fedora43/rvm_packages.lst b/.gitlab/ci/docker/fedora44/rvm_packages.lst similarity index 100% rename from .gitlab/ci/docker/fedora43/rvm_packages.lst rename to .gitlab/ci/docker/fedora44/rvm_packages.lst