diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2022-05-17 00:20:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-05-24 13:09:44 (GMT) |
| commit | 483ff3b9031fcb9651ed7d5bfe35e259d9af0769 (patch) | |
| tree | 2cecd36c0924538ae1f916c2c7adfe8881fbedd7 /.gitlab | |
| parent | 13c5153ccdf8c61946066e0c1b6fe77493b81ce5 (diff) | |
| download | CMake-483ff3b9031fcb9651ed7d5bfe35e259d9af0769.zip CMake-483ff3b9031fcb9651ed7d5bfe35e259d9af0769.tar.gz CMake-483ff3b9031fcb9651ed7d5bfe35e259d9af0769.tar.bz2 | |
ci: update Linux image to Fedora 36
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/docker/fedora36/Dockerfile (renamed from .gitlab/ci/docker/fedora35/Dockerfile) | 4 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora36/install_deps.sh (renamed from .gitlab/ci/docker/fedora35/install_deps.sh) | 0 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora36/install_ispc.sh (renamed from .gitlab/ci/docker/fedora35/install_ispc.sh) | 0 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora36/install_rvm.sh (renamed from .gitlab/ci/docker/fedora35/install_rvm.sh) | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab/ci/docker/fedora35/Dockerfile b/.gitlab/ci/docker/fedora36/Dockerfile index d1614b4..cf6ded9 100644 --- a/.gitlab/ci/docker/fedora35/Dockerfile +++ b/.gitlab/ci/docker/fedora36/Dockerfile @@ -1,10 +1,10 @@ -FROM fedora:35 as rvm-build +FROM fedora:36 as rvm-build MAINTAINER Ben Boeckel <ben.boeckel@kitware.com> COPY install_rvm.sh /root/install_rvm.sh RUN sh /root/install_rvm.sh -FROM fedora:35 +FROM fedora:36 MAINTAINER Ben Boeckel <ben.boeckel@kitware.com> COPY install_deps.sh /root/install_deps.sh diff --git a/.gitlab/ci/docker/fedora35/install_deps.sh b/.gitlab/ci/docker/fedora36/install_deps.sh index 13c70e6..13c70e6 100755 --- a/.gitlab/ci/docker/fedora35/install_deps.sh +++ b/.gitlab/ci/docker/fedora36/install_deps.sh diff --git a/.gitlab/ci/docker/fedora35/install_ispc.sh b/.gitlab/ci/docker/fedora36/install_ispc.sh index fdc14b5..fdc14b5 100755 --- a/.gitlab/ci/docker/fedora35/install_ispc.sh +++ b/.gitlab/ci/docker/fedora36/install_ispc.sh diff --git a/.gitlab/ci/docker/fedora35/install_rvm.sh b/.gitlab/ci/docker/fedora36/install_rvm.sh index 9f595e3..0011f87 100755 --- a/.gitlab/ci/docker/fedora35/install_rvm.sh +++ b/.gitlab/ci/docker/fedora36/install_rvm.sh @@ -14,6 +14,6 @@ dnf install --setopt=install_weak_deps=False -y \ curl -sSL https://get.rvm.io | bash -s stable # keep version in sync with `env_fedora*_makefiles.cmake` -/usr/local/rvm/bin/rvm install ruby-2.7.0 +/usr/local/rvm/bin/rvm install ruby-3.0.4 tar -C /usr/local -cf /root/rvm.tar rvm |