From 483ff3b9031fcb9651ed7d5bfe35e259d9af0769 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 16 May 2022 20:20:13 -0400 Subject: [PATCH] ci: update Linux image to Fedora 36 --- .gitlab/ci/docker/{fedora35 => fedora36}/Dockerfile | 4 ++-- .gitlab/ci/docker/{fedora35 => fedora36}/install_deps.sh | 0 .gitlab/ci/docker/{fedora35 => fedora36}/install_ispc.sh | 0 .gitlab/ci/docker/{fedora35 => fedora36}/install_rvm.sh | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename .gitlab/ci/docker/{fedora35 => fedora36}/Dockerfile (90%) rename .gitlab/ci/docker/{fedora35 => fedora36}/install_deps.sh (100%) rename .gitlab/ci/docker/{fedora35 => fedora36}/install_ispc.sh (100%) rename .gitlab/ci/docker/{fedora35 => fedora36}/install_rvm.sh (90%) diff --git a/.gitlab/ci/docker/fedora35/Dockerfile b/.gitlab/ci/docker/fedora36/Dockerfile similarity index 90% rename from .gitlab/ci/docker/fedora35/Dockerfile rename to .gitlab/ci/docker/fedora36/Dockerfile index d1614b47a9..cf6ded9c3f 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 COPY install_rvm.sh /root/install_rvm.sh RUN sh /root/install_rvm.sh -FROM fedora:35 +FROM fedora:36 MAINTAINER Ben Boeckel 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 similarity index 100% rename from .gitlab/ci/docker/fedora35/install_deps.sh rename to .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 similarity index 100% rename from .gitlab/ci/docker/fedora35/install_ispc.sh rename to .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 similarity index 90% rename from .gitlab/ci/docker/fedora35/install_rvm.sh rename to .gitlab/ci/docker/fedora36/install_rvm.sh index 9f595e39e9..0011f877f1 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