gitlab-ci: update to Fedora 34 base images

10 files changed, 27 insertions, 26 deletions

diff --git a/.gitlab/ci/configure_fedora33_tidy.cmake b/.gitlab/ci/configure_fedora33_tidy.cmake
deleted file mode 100644
index 9052fdc562..0000000000
--- a/.gitlab/ci/configure_fedora33_tidy.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake")
diff --git a/.gitlab/ci/configure_fedora33_common.cmake b/.gitlab/ci/configure_fedora34_common.cmake
index dee78abfe7..4484e264ff 100644
--- a/.gitlab/ci/configure_fedora33_common.cmake
+++ b/.gitlab/ci/configure_fedora34_common.cmake
@@ -1,5 +1,6 @@
 set(BUILD_CursesDialog ON CACHE BOOL "")
 set(BUILD_QtDialog ON CACHE BOOL "")
+set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
 set(CMake_TEST_JQ "/usr/bin/jq" CACHE PATH "")
 set(CMake_TEST_JSON_SCHEMA ON CACHE BOOL "")
 
diff --git a/.gitlab/ci/configure_fedora33_makefiles.cmake b/.gitlab/ci/configure_fedora34_makefiles.cmake
index 7519d95c1d..7519d95c1d 100644
--- a/.gitlab/ci/configure_fedora33_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora34_makefiles.cmake
diff --git a/.gitlab/ci/configure_fedora33_ninja.cmake b/.gitlab/ci/configure_fedora34_ninja.cmake
index 883f425e7b..37bc189dbc 100644
--- a/.gitlab/ci/configure_fedora33_ninja.cmake
+++ b/.gitlab/ci/configure_fedora34_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_fedora33_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake")
diff --git a/.gitlab/ci/configure_fedora33_ninja_multi.cmake b/.gitlab/ci/configure_fedora34_ninja_multi.cmake
index efb4b846f4..efb4b846f4 100644
--- a/.gitlab/ci/configure_fedora33_ninja_multi.cmake
+++ b/.gitlab/ci/configure_fedora34_ninja_multi.cmake
diff --git a/.gitlab/ci/configure_fedora33_sphinx.cmake b/.gitlab/ci/configure_fedora34_sphinx.cmake
index 90d159b739..90d159b739 100644
--- a/.gitlab/ci/configure_fedora33_sphinx.cmake
+++ b/.gitlab/ci/configure_fedora34_sphinx.cmake
diff --git a/.gitlab/ci/configure_fedora33_sphinx_package.cmake b/.gitlab/ci/configure_fedora34_sphinx_package.cmake
index e839de80c2..e839de80c2 100644
--- a/.gitlab/ci/configure_fedora33_sphinx_package.cmake
+++ b/.gitlab/ci/configure_fedora34_sphinx_package.cmake
diff --git a/.gitlab/ci/configure_fedora34_tidy.cmake b/.gitlab/ci/configure_fedora34_tidy.cmake
new file mode 100644
index 0000000000..9c79303dfe
--- /dev/null
+++ b/.gitlab/ci/configure_fedora34_tidy.cmake
@@ -0,0 +1,3 @@
+set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake")
diff --git a/.gitlab/ci/env_fedora33_makefiles.cmake b/.gitlab/ci/env_fedora34_makefiles.cmake
index 1d0efa7d5a..1d0efa7d5a 100644
--- a/.gitlab/ci/env_fedora33_makefiles.cmake
+++ b/.gitlab/ci/env_fedora34_makefiles.cmake
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index d0ac85e5bb..e914b00b01 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -5,7 +5,7 @@
 ### Release
 
 .linux_prep_source:
-    image: "fedora:33"
+    image: "fedora:34"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -68,8 +68,8 @@
 
 ### Fedora
 
-.fedora33:
-    image: "kitware/cmake:ci-fedora33-x86_64-2021-04-06"
+.fedora34:
+    image: "kitware/cmake:ci-fedora34-x86_64-2021-05-10"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
@@ -77,28 +77,28 @@
 
 #### Lint builds
 
-.fedora33_tidy:
-    extends: .fedora33
+.fedora34_tidy:
+    extends: .fedora34
 
     variables:
-        CMAKE_CONFIGURATION: fedora33_tidy
+        CMAKE_CONFIGURATION: fedora34_tidy
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMake_SKIP_INSTALL: 1
 
-.fedora33_sphinx:
-    extends: .fedora33
+.fedora34_sphinx:
+    extends: .fedora34
 
     variables:
-        CMAKE_CONFIGURATION: fedora33_sphinx
+        CMAKE_CONFIGURATION: fedora34_sphinx
         CTEST_NO_WARNINGS_ALLOWED: 1
         CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
         CMake_SKIP_INSTALL: 1
 
-.fedora33_sphinx_package:
-    extends: .fedora33
+.fedora34_sphinx_package:
+    extends: .fedora34
 
     variables:
-        CMAKE_CONFIGURATION: fedora33_sphinx_package
+        CMAKE_CONFIGURATION: fedora34_sphinx_package
         CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
 
 #### Build and test
@@ -117,26 +117,26 @@
         CMAKE_CONFIGURATION: debian10_aarch64_ninja
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.fedora33_ninja:
-    extends: .fedora33
+.fedora34_ninja:
+    extends: .fedora34
 
     variables:
-        CMAKE_CONFIGURATION: fedora33_ninja
+        CMAKE_CONFIGURATION: fedora34_ninja
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.fedora33_ninja_multi:
-    extends: .fedora33
+.fedora34_ninja_multi:
+    extends: .fedora34
 
     variables:
-        CMAKE_CONFIGURATION: fedora33_ninja_multi
+        CMAKE_CONFIGURATION: fedora34_ninja_multi
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_GENERATOR: "Ninja Multi-Config"
 
-.fedora33_makefiles:
-    extends: .fedora33
+.fedora34_makefiles:
+    extends: .fedora34
 
     variables:
-        CMAKE_CONFIGURATION: fedora33_makefiles
+        CMAKE_CONFIGURATION: fedora34_makefiles
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_GENERATOR: "Unix Makefiles"
 
@@ -374,7 +374,7 @@
 .cmake_org_help:
     stage: build
     extends:
-        - .fedora33
+        - .fedora34
         - .linux_builder_tags
         - .cmake_org_help_artifacts
     script: