mirror of
https://github.com/Kitware/CMake.git
synced 2025-05-08 22:37:04 +08:00
ci: update Fedora base images to Fedora 42
This commit is contained in:
parent
585e1655c2
commit
efa818f661
@ -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 <brad.king@kitware.com>"
|
@ -13,3 +13,4 @@ llvm
|
||||
rocm-comgr-devel
|
||||
rocm-hip-devel
|
||||
rocm-runtime-devel
|
||||
rocminfo
|
@ -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
|
@ -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*
|
@ -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
|
@ -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
|
@ -3,6 +3,7 @@ automake
|
||||
bison
|
||||
bzip2
|
||||
findutils
|
||||
gawk
|
||||
gcc-c++
|
||||
glibc-devel
|
||||
gnupg2
|
@ -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")
|
||||
|
Loading…
x
Reference in New Issue
Block a user