gitlab-ci: use Fedora 36 images and environments

18 files changed, 39 insertions, 39 deletions

diff --git a/.gitlab/ci/configure_fedora35_clang_analyzer.cmake b/.gitlab/ci/configure_fedora35_clang_analyzer.cmake
deleted file mode 100644
index 761a32382f..0000000000
--- a/.gitlab/ci/configure_fedora35_clang_analyzer.cmake
+++ /dev/null
@@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake")
diff --git a/.gitlab/ci/configure_fedora35_tidy.cmake b/.gitlab/ci/configure_fedora35_tidy.cmake
deleted file mode 100644
index 752d241d4b..0000000000
--- a/.gitlab/ci/configure_fedora35_tidy.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake")
diff --git a/.gitlab/ci/configure_fedora35_asan.cmake b/.gitlab/ci/configure_fedora36_asan.cmake
index 84fefad429..51977d9454 100644
--- a/.gitlab/ci/configure_fedora35_asan.cmake
+++ b/.gitlab/ci/configure_fedora36_asan.cmake
@@ -1,4 +1,4 @@
 set(CMAKE_C_FLAGS "-fsanitize=address" CACHE STRING "")
 set(CMAKE_CXX_FLAGS "-fsanitize=address" CACHE STRING "")
 
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora36_common.cmake")
diff --git a/.gitlab/ci/configure_fedora36_clang_analyzer.cmake b/.gitlab/ci/configure_fedora36_clang_analyzer.cmake
new file mode 100644
index 0000000000..456936b4fb
--- /dev/null
+++ b/.gitlab/ci/configure_fedora36_clang_analyzer.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora36_common.cmake")
diff --git a/.gitlab/ci/configure_fedora35_common.cmake b/.gitlab/ci/configure_fedora36_common.cmake
index 4484e264ff..4484e264ff 100644
--- a/.gitlab/ci/configure_fedora35_common.cmake
+++ b/.gitlab/ci/configure_fedora36_common.cmake
diff --git a/.gitlab/ci/configure_fedora35_makefiles.cmake b/.gitlab/ci/configure_fedora36_makefiles.cmake
index 9dc5ca982c..9dc5ca982c 100644
--- a/.gitlab/ci/configure_fedora35_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora36_makefiles.cmake
diff --git a/.gitlab/ci/configure_fedora35_ninja.cmake b/.gitlab/ci/configure_fedora36_ninja.cmake
index e6143b7760..7e335132bb 100644
--- a/.gitlab/ci/configure_fedora35_ninja.cmake
+++ b/.gitlab/ci/configure_fedora36_ninja.cmake
@@ -8,4 +8,4 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3" CACHE STRING "")
 # Cover compilation with C++11 only and not higher standards.
 set(CMAKE_CXX_STANDARD "11" CACHE STRING "")
 
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora36_common.cmake")
diff --git a/.gitlab/ci/configure_fedora35_ninja_multi.cmake b/.gitlab/ci/configure_fedora36_ninja_multi.cmake
index efb4b846f4..efb4b846f4 100644
--- a/.gitlab/ci/configure_fedora35_ninja_multi.cmake
+++ b/.gitlab/ci/configure_fedora36_ninja_multi.cmake
diff --git a/.gitlab/ci/configure_fedora35_sphinx.cmake b/.gitlab/ci/configure_fedora36_sphinx.cmake
index 90d159b739..90d159b739 100644
--- a/.gitlab/ci/configure_fedora35_sphinx.cmake
+++ b/.gitlab/ci/configure_fedora36_sphinx.cmake
diff --git a/.gitlab/ci/configure_fedora35_sphinx_package.cmake b/.gitlab/ci/configure_fedora36_sphinx_package.cmake
index e839de80c2..e839de80c2 100644
--- a/.gitlab/ci/configure_fedora35_sphinx_package.cmake
+++ b/.gitlab/ci/configure_fedora36_sphinx_package.cmake
diff --git a/.gitlab/ci/configure_fedora36_tidy.cmake b/.gitlab/ci/configure_fedora36_tidy.cmake
new file mode 100644
index 0000000000..38414d3b5f
--- /dev/null
+++ b/.gitlab/ci/configure_fedora36_tidy.cmake
@@ -0,0 +1,3 @@
+set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora36_common.cmake")
diff --git a/.gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora36_asan.lsan.supp
index 8ec1a0358b..8ec1a0358b 100644
--- a/.gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp
+++ b/.gitlab/ci/ctest_memcheck_fedora36_asan.lsan.supp
diff --git a/.gitlab/ci/env_fedora35_makefiles.cmake b/.gitlab/ci/env_fedora35_makefiles.cmake
deleted file mode 100644
index aa84e2396a..0000000000
--- a/.gitlab/ci/env_fedora35_makefiles.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-2.7.0")
-set(ENV{PATH} "/usr/lib64/mpich/bin:$ENV{PATH}")
diff --git a/.gitlab/ci/env_fedora35_asan.sh b/.gitlab/ci/env_fedora36_asan.sh
index e9764862eb..e9764862eb 100644
--- a/.gitlab/ci/env_fedora35_asan.sh
+++ b/.gitlab/ci/env_fedora36_asan.sh
diff --git a/.gitlab/ci/env_fedora35_clang_analyzer.sh b/.gitlab/ci/env_fedora36_clang_analyzer.sh
index d732c0ba20..d732c0ba20 100644
--- a/.gitlab/ci/env_fedora35_clang_analyzer.sh
+++ b/.gitlab/ci/env_fedora36_clang_analyzer.sh
diff --git a/.gitlab/ci/env_fedora36_makefiles.cmake b/.gitlab/ci/env_fedora36_makefiles.cmake
new file mode 100644
index 0000000000..2bcb6d04cc
--- /dev/null
+++ b/.gitlab/ci/env_fedora36_makefiles.cmake
@@ -0,0 +1,2 @@
+set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-3.0.4")
+set(ENV{PATH} "/usr/lib64/mpich/bin:$ENV{PATH}")
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index f9af14f312..a822d9420e 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -5,7 +5,7 @@
 ### Release
 
 .linux_prep_source:
-    image: "fedora:35"
+    image: "fedora:36"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -68,8 +68,8 @@
 
 ### Fedora
 
-.fedora35:
-    image: "kitware/cmake:ci-fedora35-x86_64-2022-04-22"
+.fedora36:
+    image: "kitware/cmake:ci-fedora36-x86_64-2022-05-17"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
@@ -77,37 +77,37 @@
 
 #### Lint builds
 
-.fedora35_tidy:
-    extends: .fedora35
+.fedora36_tidy:
+    extends: .fedora36
 
     variables:
-        CMAKE_CONFIGURATION: fedora35_tidy
+        CMAKE_CONFIGURATION: fedora36_tidy
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_CI_NO_INSTALL: 1
 
-.fedora35_clang_analyzer:
-    extends: .fedora35
+.fedora36_clang_analyzer:
+    extends: .fedora36
 
     variables:
-        CMAKE_CONFIGURATION: fedora35_clang_analyzer
+        CMAKE_CONFIGURATION: fedora36_clang_analyzer
         CMAKE_CI_BUILD_TYPE: Debug
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_CI_NO_INSTALL: 1
 
-.fedora35_sphinx:
-    extends: .fedora35
+.fedora36_sphinx:
+    extends: .fedora36
 
     variables:
-        CMAKE_CONFIGURATION: fedora35_sphinx
+        CMAKE_CONFIGURATION: fedora36_sphinx
         CTEST_NO_WARNINGS_ALLOWED: 1
         CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
         CMAKE_CI_NO_INSTALL: 1
 
-.fedora35_sphinx_package:
-    extends: .fedora35
+.fedora36_sphinx_package:
+    extends: .fedora36
 
     variables:
-        CMAKE_CONFIGURATION: fedora35_sphinx_package
+        CMAKE_CONFIGURATION: fedora36_sphinx_package
         CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
 
 #### Build and test
@@ -137,27 +137,27 @@
         CMAKE_CI_NO_INSTALL: 1
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.fedora35_ninja:
-    extends: .fedora35
+.fedora36_ninja:
+    extends: .fedora36
 
     variables:
-        CMAKE_CONFIGURATION: fedora35_ninja
+        CMAKE_CONFIGURATION: fedora36_ninja
         CMAKE_CI_BUILD_TYPE: Release
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.fedora35_ninja_multi:
-    extends: .fedora35
+.fedora36_ninja_multi:
+    extends: .fedora36
 
     variables:
-        CMAKE_CONFIGURATION: fedora35_ninja_multi
+        CMAKE_CONFIGURATION: fedora36_ninja_multi
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_GENERATOR: "Ninja Multi-Config"
 
-.fedora35_makefiles:
-    extends: .fedora35
+.fedora36_makefiles:
+    extends: .fedora36
 
     variables:
-        CMAKE_CONFIGURATION: fedora35_makefiles
+        CMAKE_CONFIGURATION: fedora36_makefiles
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_GENERATOR: "Unix Makefiles"
 
@@ -189,13 +189,13 @@
         CTEST_MEMORYCHECK_TYPE: AddressSanitizer
         CTEST_MEMORYCHECK_SANITIZER_OPTIONS: ""
 
-.fedora35_asan:
+.fedora36_asan:
     extends:
-        - .fedora35
+        - .fedora36
         - .fedora_asan_addon
 
     variables:
-        CMAKE_CONFIGURATION: fedora35_asan
+        CMAKE_CONFIGURATION: fedora36_asan
 
 ### Intel Compiler
 
@@ -389,7 +389,7 @@
 
 .cmake_codespell_linux:
     stage: build
-    extends: .fedora35
+    extends: .fedora36
     script:
         - codespell
     interruptible: true
@@ -532,7 +532,7 @@
 .cmake_org_help:
     stage: build
     extends:
-        - .fedora35
+        - .fedora36
         - .linux_builder_tags
         - .cmake_org_help_artifacts
     script:
diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml
index d831c3e55c..38d40a992f 100644
--- a/.gitlab/upload.yml
+++ b/.gitlab/upload.yml
@@ -1,7 +1,7 @@
 # Steps for uploading artifacts
 
 .rsync_upload_package:
-    image: "fedora:35"
+    image: "fedora:36"
     stage: upload
     tags:
         - cmake
@@ -21,7 +21,7 @@
 
 .rsync_upload_help:
     stage: upload
-    image: "fedora:35"
+    image: "fedora:36"
     tags:
         - cmake
         - docker