gitlab-ci: update Linux CI to use Fedora 33

11 files changed, 41 insertions, 41 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eda96ae..5550c2f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ prep:source-package:
 
 prep:doc-package:
     extends:
-        - .fedora31_sphinx_package
+        - .fedora33_sphinx_package
         - .cmake_prep_doc_linux
         - .linux_builder_tags_qt
         - .cmake_doc_artifacts
@@ -72,16 +72,16 @@ build:debian10-iwyu:
         - .linux_builder_tags
         - .run_automatically
 
-build:fedora31-tidy:
+build:fedora33-tidy:
     extends:
-        - .fedora31_tidy
+        - .fedora33_tidy
         - .cmake_build_linux
         - .linux_builder_tags_qt
         - .run_automatically
 
-build:fedora31-sphinx:
+build:fedora33-sphinx:
     extends:
-        - .fedora31_sphinx
+        - .fedora33_sphinx
         - .cmake_build_linux
         - .linux_builder_tags_qt
         - .run_automatically
@@ -110,9 +110,9 @@ test:debian10-ninja:
     needs:
         - build:centos6-release
 
-test:fedora31-makefiles:
+test:fedora33-makefiles:
     extends:
-        - .fedora31_makefiles
+        - .fedora33_makefiles
         - .cmake_test_linux_package
         - .linux_builder_tags_qt
         - .run_dependent
@@ -132,36 +132,36 @@ test:cuda10.2-nvidia:
     needs:
         - build:centos6-release
 
-build:fedora31-ninja:
+build:fedora33-ninja:
     extends:
-        - .fedora31_ninja
+        - .fedora33_ninja
         - .cmake_build_linux
         - .cmake_build_artifacts
         - .linux_builder_tags_qt
         - .run_manually
 
-test:fedora31-ninja:
+test:fedora33-ninja:
     extends:
-        - .fedora31_ninja
+        - .fedora33_ninja
         - .cmake_test_linux
         - .linux_builder_tags_x11
         - .cmake_test_artifacts
         - .run_dependent
     dependencies:
-        - build:fedora31-ninja
+        - build:fedora33-ninja
     needs:
-        - build:fedora31-ninja
+        - build:fedora33-ninja
 
-test:fedora31-ninja-multi:
+test:fedora33-ninja-multi:
     extends:
-        - .fedora31_ninja_multi
+        - .fedora33_ninja_multi
         - .cmake_test_linux_external
         - .linux_builder_tags_qt
         - .run_dependent
     dependencies:
-        - test:fedora31-ninja
+        - test:fedora33-ninja
     needs:
-        - test:fedora31-ninja
+        - test:fedora33-ninja
 
 build:linux-x86_64-package:
     extends:
diff --git a/.gitlab/ci/configure_fedora31_tidy.cmake b/.gitlab/ci/configure_fedora31_tidy.cmake
deleted file mode 100644
index 55d022c..0000000
--- a/.gitlab/ci/configure_fedora31_tidy.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake")
diff --git a/.gitlab/ci/configure_fedora31_common.cmake b/.gitlab/ci/configure_fedora33_common.cmake
index c343833..c343833 100644
--- a/.gitlab/ci/configure_fedora31_common.cmake
+++ b/.gitlab/ci/configure_fedora33_common.cmake
diff --git a/.gitlab/ci/configure_fedora31_makefiles.cmake b/.gitlab/ci/configure_fedora33_makefiles.cmake
index 8d2454f..8d2454f 100644
--- a/.gitlab/ci/configure_fedora31_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora33_makefiles.cmake
diff --git a/.gitlab/ci/configure_fedora31_ninja.cmake b/.gitlab/ci/configure_fedora33_ninja.cmake
index ea429c1..883f425 100644
--- a/.gitlab/ci/configure_fedora31_ninja.cmake
+++ b/.gitlab/ci/configure_fedora33_ninja.cmake
@@ -4,4 +4,4 @@ set(CMake_TEST_GUI "ON" CACHE BOOL "")
 # Cover compilation with C++11 only and not higher standards.
 set(CMAKE_CXX_STANDARD "11" CACHE STRING "")
 
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake")
diff --git a/.gitlab/ci/configure_fedora31_ninja_multi.cmake b/.gitlab/ci/configure_fedora33_ninja_multi.cmake
index efb4b84..efb4b84 100644
--- a/.gitlab/ci/configure_fedora31_ninja_multi.cmake
+++ b/.gitlab/ci/configure_fedora33_ninja_multi.cmake
diff --git a/.gitlab/ci/configure_fedora31_sphinx.cmake b/.gitlab/ci/configure_fedora33_sphinx.cmake
index 90d159b..90d159b 100644
--- a/.gitlab/ci/configure_fedora31_sphinx.cmake
+++ b/.gitlab/ci/configure_fedora33_sphinx.cmake
diff --git a/.gitlab/ci/configure_fedora31_sphinx_package.cmake b/.gitlab/ci/configure_fedora33_sphinx_package.cmake
index e839de8..e839de8 100644
--- a/.gitlab/ci/configure_fedora31_sphinx_package.cmake
+++ b/.gitlab/ci/configure_fedora33_sphinx_package.cmake
diff --git a/.gitlab/ci/configure_fedora33_tidy.cmake b/.gitlab/ci/configure_fedora33_tidy.cmake
new file mode 100644
index 0000000..9052fdc
--- /dev/null
+++ b/.gitlab/ci/configure_fedora33_tidy.cmake
@@ -0,0 +1,3 @@
+set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake")
diff --git a/.gitlab/ci/env_fedora31_makefiles.cmake b/.gitlab/ci/env_fedora33_makefiles.cmake
index 1d0efa7..1d0efa7 100644
--- a/.gitlab/ci/env_fedora31_makefiles.cmake
+++ b/.gitlab/ci/env_fedora33_makefiles.cmake
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 4e8fb80..3808020 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -48,36 +48,36 @@
 
 ### Fedora
 
-.fedora31:
-    image: "kitware/cmake:ci-fedora31-x86_64-2020-10-22"
+.fedora33:
+    image: "kitware/cmake:ci-fedora33-x86_64-2020-11-13"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
 
 #### Lint builds
 
-.fedora31_tidy:
-    extends: .fedora31
+.fedora33_tidy:
+    extends: .fedora33
 
     variables:
-        CMAKE_CONFIGURATION: fedora31_tidy
+        CMAKE_CONFIGURATION: fedora33_tidy
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMake_SKIP_INSTALL: 1
 
-.fedora31_sphinx:
-    extends: .fedora31
+.fedora33_sphinx:
+    extends: .fedora33
 
     variables:
-        CMAKE_CONFIGURATION: fedora31_sphinx
+        CMAKE_CONFIGURATION: fedora33_sphinx
         CTEST_NO_WARNINGS_ALLOWED: 1
         CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
         CMake_SKIP_INSTALL: 1
 
-.fedora31_sphinx_package:
-    extends: .fedora31
+.fedora33_sphinx_package:
+    extends: .fedora33
 
     variables:
-        CMAKE_CONFIGURATION: fedora31_sphinx_package
+        CMAKE_CONFIGURATION: fedora33_sphinx_package
         CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
 
 #### Build and test
@@ -89,26 +89,26 @@
         CMAKE_CONFIGURATION: debian10_ninja
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.fedora31_ninja:
-    extends: .fedora31
+.fedora33_ninja:
+    extends: .fedora33
 
     variables:
-        CMAKE_CONFIGURATION: fedora31_ninja
+        CMAKE_CONFIGURATION: fedora33_ninja
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.fedora31_ninja_multi:
-    extends: .fedora31
+.fedora33_ninja_multi:
+    extends: .fedora33
 
     variables:
-        CMAKE_CONFIGURATION: fedora31_ninja_multi
+        CMAKE_CONFIGURATION: fedora33_ninja_multi
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_GENERATOR: "Ninja Multi-Config"
 
-.fedora31_makefiles:
-    extends: .fedora31
+.fedora33_makefiles:
+    extends: .fedora33
 
     variables:
-        CMAKE_CONFIGURATION: fedora31_makefiles
+        CMAKE_CONFIGURATION: fedora33_makefiles
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_GENERATOR: "Unix Makefiles"