Commit 41acdc3a authored by Ben Boeckel's avatar Ben Boeckel
Browse files

gitlab-ci: use Fedora 33 images

parent 5e079b91
...@@ -47,7 +47,7 @@ build:linux-plain: ...@@ -47,7 +47,7 @@ build:linux-plain:
test:linux-plain: test:linux-plain:
extends: extends:
- .fedora31_plain - .fedora33_plain
- .cmake_test_linux - .cmake_test_linux
- .cmake_package_artifacts - .cmake_package_artifacts
- .linux_test_tags - .linux_test_tags
...@@ -81,7 +81,7 @@ build:linux-egl: ...@@ -81,7 +81,7 @@ build:linux-egl:
test:linux-egl: test:linux-egl:
extends: extends:
# Required to get EGL support in the container. # Required to get EGL support in the container.
- .fedora31_egl - .fedora33_egl
- .cmake_test_linux - .cmake_test_linux
- .cmake_package_artifacts - .cmake_package_artifacts
- .linux_test_tags - .linux_test_tags
......
...@@ -40,21 +40,21 @@ ...@@ -40,21 +40,21 @@
variables: variables:
CMAKE_CONFIGURATION: linux_osmesa_static CMAKE_CONFIGURATION: linux_osmesa_static
.fedora31: .fedora33:
image: "kitware/paraview:ci-superbuild-fedora31-20201027" image: "kitware/paraview:ci-superbuild-fedora33-20201112"
variables: variables:
GIT_SUBMODULE_STRATEGY: none GIT_SUBMODULE_STRATEGY: none
GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci
.fedora31_plain: .fedora33_plain:
extends: .fedora31 extends: .fedora33
variables: variables:
CMAKE_CONFIGURATION: linux_plain CMAKE_CONFIGURATION: linux_plain
.fedora31_egl: .fedora33_egl:
extends: .fedora31 extends: .fedora33
variables: variables:
CMAKE_CONFIGURATION: linux_egl CMAKE_CONFIGURATION: linux_egl
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment