Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-05-09 06:42:18 +08:00
Code Issues Projects Releases Wiki Activity

ci: update Fedora base images to Fedora 42

Browse Source
This commit is contained in:
Brad King 2025-04-22 11:51:06 -04:00
parent 585e1655c2
commit efa818f661
16 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/ci/docker/fedora41-hip/Dockerfile → .gitlab/ci/docker/fedora42-hip/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG BASE_IMAGE=fedora:41 ARG BASE_IMAGE=fedora:42
FROM ${BASE_IMAGE} AS dnf-cache FROM ${BASE_IMAGE} AS dnf-cache
LABEL maintainer="Brad King <brad.king@kitware.com>" LABEL maintainer="Brad King <brad.king@kitware.com>"

1
.gitlab/ci/docker/fedora41-hip/deps_packages.lst → .gitlab/ci/docker/fedora42-hip/deps_packages.lst
View File

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

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

4
.gitlab/ci/docker/fedora41/Dockerfile → .gitlab/ci/docker/fedora42/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG BASE_IMAGE=fedora:41 ARG BASE_IMAGE=fedora:42
FROM ${BASE_IMAGE} AS dnf-cache FROM ${BASE_IMAGE} AS dnf-cache
# Populate DNF cache w/ the fresh metadata and prefetch packages. # 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 tar -C /usr/local -xf /root/rvm.tar
RUN --mount=type=bind,from=rbenv-build,source=/root,target=/root \ 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
.gitlab/ci/docker/fedora41/build_iwyu.sh → .gitlab/ci/docker/fedora42/build_iwyu.sh
View File

2
.gitlab/ci/docker/fedora41/build_rbenv.sh → .gitlab/ci/docker/fedora42/build_rbenv.sh
View File

@ -7,7 +7,7 @@ echo "gem: --no-document" > ~/.gemrc
# Ruby rbenv # Ruby rbenv
export RUBY_CONFIGURE_OPTS=--disable-install-doc export RUBY_CONFIGURE_OPTS=--disable-install-doc
export RUBY_BUILD_CURL_OPTS=-C- 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 cat <<EOF >/tmp/exclude.lst
*LICENSE* *LICENSE*

0
.gitlab/ci/docker/fedora41/build_rust.sh → .gitlab/ci/docker/fedora42/build_rust.sh
View File

2
.gitlab/ci/docker/fedora41/build_rvm.sh → .gitlab/ci/docker/fedora42/build_rvm.sh
View File

@ -13,7 +13,7 @@ curl -sSL https://get.rvm.io | bash -s stable --ignore-dotfiles
export rvm_silence_banner=1 export rvm_silence_banner=1
# keep version in sync with `env_fedora*_makefiles.cmake` # 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 for p in archives docs examples gem-cache log src; do
touch /usr/local/rvm/${p}/.tar_exclude touch /usr/local/rvm/${p}/.tar_exclude

2
.gitlab/ci/docker/fedora41/deps_packages.lst → .gitlab/ci/docker/fedora42/deps_packages.lst
View File

@ -89,7 +89,7 @@ hdf5-mpich-devel
hdf5-openmpi-devel hdf5-openmpi-devel
ImageMagick-c++-devel ImageMagick-c++-devel
jasper-devel jasper-devel
java-11-openjdk-devel java-21-openjdk-devel
jsoncpp-devel jsoncpp-devel
lapack-devel lapack-devel
libarchive-devel libarchive-devel

0
.gitlab/ci/docker/fedora41/dnf.conf → .gitlab/ci/docker/fedora42/dnf.conf
View File

0
.gitlab/ci/docker/fedora41/install_deps.sh → .gitlab/ci/docker/fedora42/install_deps.sh
View File

0
.gitlab/ci/docker/fedora41/iwyu_packages.lst → .gitlab/ci/docker/fedora42/iwyu_packages.lst
View File

0
.gitlab/ci/docker/fedora41/rbenv_packages.lst → .gitlab/ci/docker/fedora42/rbenv_packages.lst
View File

0
.gitlab/ci/docker/fedora41/rust_packages.lst → .gitlab/ci/docker/fedora42/rust_packages.lst
View File

1
.gitlab/ci/docker/fedora41/rvm_packages.lst → .gitlab/ci/docker/fedora42/rvm_packages.lst
View File

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

2
.gitlab/ci/env_fedora41_makefiles.cmake
View File

@ -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")