浏览代码

ci: use Fedora 39 images and environments

Brad King 1 年之前
父节点
当前提交
99238b23e9
共有 43 个文件被更改,包括 112 次插入114 次删除
  1. 44 44
      .gitlab-ci.yml
  2. 0 3
      .gitlab/ci/configure_fedora38_clang_analyzer.cmake
  3. 1 1
      .gitlab/ci/configure_fedora39_asan.cmake
  4. 3 0
      .gitlab/ci/configure_fedora39_clang_analyzer.cmake
  5. 0 0
      .gitlab/ci/configure_fedora39_common.cmake
  6. 0 1
      .gitlab/ci/configure_fedora39_common_clang.cmake
  7. 0 0
      .gitlab/ci/configure_fedora39_extdeps.cmake
  8. 0 0
      .gitlab/ci/configure_fedora39_hip_radeon.cmake
  9. 0 0
      .gitlab/ci/configure_fedora39_makefiles.cmake
  10. 1 1
      .gitlab/ci/configure_fedora39_makefiles_clang.cmake
  11. 1 1
      .gitlab/ci/configure_fedora39_makefiles_symlinked.cmake
  12. 1 1
      .gitlab/ci/configure_fedora39_ninja.cmake
  13. 1 1
      .gitlab/ci/configure_fedora39_ninja_clang.cmake
  14. 0 0
      .gitlab/ci/configure_fedora39_ninja_multi.cmake
  15. 1 1
      .gitlab/ci/configure_fedora39_ninja_multi_clang.cmake
  16. 0 0
      .gitlab/ci/configure_fedora39_sphinx.cmake
  17. 0 0
      .gitlab/ci/configure_fedora39_sphinx_package.cmake
  18. 1 1
      .gitlab/ci/configure_fedora39_tidy.cmake
  19. 0 0
      .gitlab/ci/ctest_memcheck_fedora39_asan.lsan.supp
  20. 0 4
      .gitlab/ci/env_fedora38_common_clang.sh
  21. 0 1
      .gitlab/ci/env_fedora38_hip_radeon.sh
  22. 0 1
      .gitlab/ci/env_fedora38_makefiles_clang.sh
  23. 0 1
      .gitlab/ci/env_fedora38_makefiles_symlinked.cmake
  24. 0 1
      .gitlab/ci/env_fedora38_makefiles_symlinked.sh
  25. 0 1
      .gitlab/ci/env_fedora38_ninja_clang.sh
  26. 0 1
      .gitlab/ci/env_fedora38_ninja_multi_clang.sh
  27. 0 0
      .gitlab/ci/env_fedora39_asan.sh
  28. 0 0
      .gitlab/ci/env_fedora39_clang_analyzer.sh
  29. 3 0
      .gitlab/ci/env_fedora39_common_clang.sh
  30. 0 0
      .gitlab/ci/env_fedora39_extdeps.sh
  31. 1 0
      .gitlab/ci/env_fedora39_hip_radeon.sh
  32. 0 0
      .gitlab/ci/env_fedora39_makefiles.cmake
  33. 0 0
      .gitlab/ci/env_fedora39_makefiles.sh
  34. 1 0
      .gitlab/ci/env_fedora39_makefiles_clang.sh
  35. 1 0
      .gitlab/ci/env_fedora39_makefiles_symlinked.cmake
  36. 1 0
      .gitlab/ci/env_fedora39_makefiles_symlinked.sh
  37. 0 0
      .gitlab/ci/env_fedora39_ninja.sh
  38. 1 0
      .gitlab/ci/env_fedora39_ninja_clang.sh
  39. 0 0
      .gitlab/ci/env_fedora39_ninja_multi.sh
  40. 1 0
      .gitlab/ci/env_fedora39_ninja_multi_clang.sh
  41. 0 0
      .gitlab/ci/pre_build_fedora39_tidy.sh
  42. 47 47
      .gitlab/os-linux.yml
  43. 2 2
      .gitlab/upload.yml

+ 44 - 44
.gitlab-ci.yml

@@ -59,7 +59,7 @@ p:source-package:
 
 p:doc-package:
     extends:
-        - .fedora38_sphinx_package
+        - .fedora39_sphinx_package
         - .cmake_prep_doc_linux
         - .linux_x86_64_tags
         - .cmake_doc_artifacts
@@ -108,17 +108,17 @@ l:iwyu-debian12:
         - .cmake_cdash_artifacts
         - .run_automatically
 
-l:tidy-fedora38:
+l:tidy-fedora39:
     extends:
-        - .fedora38_tidy
+        - .fedora39_tidy
         - .cmake_build_linux
         - .linux_x86_64_tags
         - .cmake_cdash_artifacts
         - .run_automatically
 
-l:sphinx-fedora38:
+l:sphinx-fedora39:
     extends:
-        - .fedora38_sphinx
+        - .fedora39_sphinx
         - .cmake_build_linux
         - .cmake_sphinx_artifacts
         - .linux_x86_64_tags
@@ -127,9 +127,9 @@ l:sphinx-fedora38:
         CMAKE_CI_JOB_CONTINUOUS: "true"
         CMAKE_CI_JOB_HELP: "true"
 
-l:clang-analyzer-fedora38:
+l:clang-analyzer-fedora39:
     extends:
-        - .fedora38_clang_analyzer
+        - .fedora39_clang_analyzer
         - .cmake_build_linux
         - .linux_x86_64_tags
         - .run_automatically
@@ -223,9 +223,9 @@ t:debian12-hip-radeon:
     variables:
         CMAKE_CI_NO_MR: "true"
 
-t:fedora38-hip-radeon:
+t:fedora39-hip-radeon:
     extends:
-        - .fedora38_hip_radeon
+        - .fedora39_hip_radeon
         - .cmake_test_linux_release
         - .linux_x86_64_tags_radeon
         - .run_dependent
@@ -233,9 +233,9 @@ t:fedora38-hip-radeon:
     variables:
         CMAKE_CI_NO_MR: "true"
 
-t:fedora38-ninja-clang:
+t:fedora39-ninja-clang:
     extends:
-        - .fedora38_ninja_clang
+        - .fedora39_ninja_clang
         - .cmake_test_linux_release
         - .linux_x86_64_tags
         - .run_dependent
@@ -243,9 +243,9 @@ t:fedora38-ninja-clang:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:fedora38-ninja-multi-clang:
+t:fedora39-ninja-multi-clang:
     extends:
-        - .fedora38_ninja_multi_clang
+        - .fedora39_ninja_multi_clang
         - .cmake_test_linux_release
         - .linux_x86_64_tags
         - .run_dependent
@@ -253,9 +253,9 @@ t:fedora38-ninja-multi-clang:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:fedora38-makefiles-clang:
+t:fedora39-makefiles-clang:
     extends:
-        - .fedora38_makefiles_clang
+        - .fedora39_makefiles_clang
         - .cmake_test_linux_release
         - .linux_x86_64_tags
         - .run_dependent
@@ -263,17 +263,17 @@ t:fedora38-makefiles-clang:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:fedora38-makefiles:
+t:fedora39-makefiles:
     extends:
-        - .fedora38_makefiles
+        - .fedora39_makefiles
         - .cmake_test_linux_release
         - .linux_x86_64_tags
         - .run_dependent
         - .needs_centos7_x86_64
 
-t:fedora38-makefiles-nospace:
+t:fedora39-makefiles-nospace:
     extends:
-        - .fedora38_makefiles
+        - .fedora39_makefiles
         - .cmake_test_linux_release
         - .linux_x86_64_tags
         - .cmake_junit_artifacts
@@ -281,7 +281,7 @@ t:fedora38-makefiles-nospace:
         - .needs_centos7_x86_64
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
-        CMAKE_CI_BUILD_NAME: fedora38_makefiles_nospace
+        CMAKE_CI_BUILD_NAME: fedora39_makefiles_nospace
         CMAKE_CI_JOB_NIGHTLY: "true"
 
 t:nvhpc22.11-ninja:
@@ -413,9 +413,9 @@ t:debian10-legacy:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-b:fedora38-ninja:
+b:fedora39-ninja:
     extends:
-        - .fedora38_ninja
+        - .fedora39_ninja
         - .cmake_build_linux
         - .cmake_build_artifacts
         - .linux_x86_64_tags
@@ -423,9 +423,9 @@ b:fedora38-ninja:
     variables:
         CMAKE_CI_JOB_CONTINUOUS: "true"
 
-b:fedora38-makefiles-symlinked:
+b:fedora39-makefiles-symlinked:
     extends:
-        - .fedora38_makefiles_symlinked
+        - .fedora39_makefiles_symlinked
         - .cmake_build_linux
         - .cmake_build_artifacts
         - .linux_x86_64_tags
@@ -460,54 +460,54 @@ b:debian12-aarch64-extdeps:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-b:fedora38-extdeps:
+b:fedora39-extdeps:
     extends:
-        - .fedora38_extdeps
+        - .fedora39_extdeps
         - .cmake_build_linux_standalone
         - .linux_x86_64_tags
         - .run_manually
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:fedora38-ninja:
+t:fedora39-ninja:
     extends:
-        - .fedora38_ninja
+        - .fedora39_ninja
         - .cmake_test_linux
         - .linux_x86_64_tags_x11
         - .cmake_test_artifacts
         - .run_dependent
     dependencies:
-        - b:fedora38-ninja
+        - b:fedora39-ninja
     needs:
-        - b:fedora38-ninja
+        - b:fedora39-ninja
     variables:
         CMAKE_CI_JOB_CONTINUOUS: "true"
 
-t:fedora38-makefiles-symlinked:
+t:fedora39-makefiles-symlinked:
     extends:
-        - .fedora38_makefiles_symlinked
+        - .fedora39_makefiles_symlinked
         - .cmake_test_linux
         - .linux_x86_64_tags_x11
         - .cmake_test_artifacts
         - .run_dependent
     dependencies:
-        - b:fedora38-makefiles-symlinked
+        - b:fedora39-makefiles-symlinked
     needs:
-        - b:fedora38-makefiles-symlinked
+        - b:fedora39-makefiles-symlinked
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:fedora38-ninja-multi:
+t:fedora39-ninja-multi:
     extends:
-        - .fedora38_ninja_multi
+        - .fedora39_ninja_multi
         - .cmake_test_linux_external
         - .linux_x86_64_tags
         - .cmake_junit_artifacts
         - .run_dependent
     dependencies:
-        - t:fedora38-ninja
+        - t:fedora39-ninja
     needs:
-        - t:fedora38-ninja
+        - t:fedora39-ninja
 
 t:intel2016-makefiles:
     extends:
@@ -874,9 +874,9 @@ u:linux-aarch64-package:
 
 ## Sanitizer builds
 
-b:fedora38-asan:
+b:fedora39-asan:
     extends:
-        - .fedora38_asan
+        - .fedora39_asan
         - .cmake_build_linux
         - .cmake_build_artifacts
         - .linux_x86_64_tags
@@ -884,16 +884,16 @@ b:fedora38-asan:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:fedora38-asan:
+t:fedora39-asan:
     extends:
-        - .fedora38_asan
+        - .fedora39_asan
         - .cmake_memcheck_linux
         - .linux_x86_64_tags
         - .run_dependent
     dependencies:
-        - b:fedora38-asan
+        - b:fedora39-asan
     needs:
-        - b:fedora38-asan
+        - b:fedora39-asan
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 

+ 0 - 3
.gitlab/ci/configure_fedora38_clang_analyzer.cmake

@@ -1,3 +0,0 @@
-set(configure_no_sccache 1)
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake")

+ 1 - 1
.gitlab/ci/configure_fedora38_asan.cmake → .gitlab/ci/configure_fedora39_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_fedora38_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")

+ 3 - 0
.gitlab/ci/configure_fedora39_clang_analyzer.cmake

@@ -0,0 +1,3 @@
+set(configure_no_sccache 1)
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")

+ 0 - 0
.gitlab/ci/configure_fedora38_common.cmake → .gitlab/ci/configure_fedora39_common.cmake


+ 0 - 1
.gitlab/ci/configure_fedora38_common_clang.cmake → .gitlab/ci/configure_fedora39_common_clang.cmake

@@ -1,6 +1,5 @@
 set(CMAKE_Fortran_COMPILER "/usr/bin/flang-new" CACHE FILEPATH "")
 set(CMAKE_Fortran_COMPILER_ID "LLVMFlang" CACHE STRING "")
 set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "1" CACHE BOOL "")
-set(CMAKE_Fortran_FLAGS "-flang-experimental-exec" CACHE STRING "")
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")

+ 0 - 0
.gitlab/ci/configure_fedora38_extdeps.cmake → .gitlab/ci/configure_fedora39_extdeps.cmake


+ 0 - 0
.gitlab/ci/configure_fedora38_hip_radeon.cmake → .gitlab/ci/configure_fedora39_hip_radeon.cmake


+ 0 - 0
.gitlab/ci/configure_fedora38_makefiles.cmake → .gitlab/ci/configure_fedora39_makefiles.cmake


+ 1 - 1
.gitlab/ci/configure_fedora38_makefiles_clang.cmake → .gitlab/ci/configure_fedora39_makefiles_clang.cmake

@@ -2,4 +2,4 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "")
   set(CMAKE_TESTS_CDASH_SERVER "https://open.cdash.org" CACHE STRING "")
 endif()
 
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake")

+ 1 - 1
.gitlab/ci/configure_fedora38_makefiles_symlinked.cmake → .gitlab/ci/configure_fedora39_makefiles_symlinked.cmake

@@ -1,2 +1,2 @@
 include("${CMAKE_CURRENT_LIST_DIR}/configure_symlinked_common.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")

+ 1 - 1
.gitlab/ci/configure_fedora38_ninja.cmake → .gitlab/ci/configure_fedora39_ninja.cmake

@@ -11,4 +11,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_fedora38_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")

+ 1 - 1
.gitlab/ci/configure_fedora38_ninja_multi_clang.cmake → .gitlab/ci/configure_fedora39_ninja_clang.cmake

@@ -1,4 +1,4 @@
 set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "")
 set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "")
 
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake")

+ 0 - 0
.gitlab/ci/configure_fedora38_ninja_multi.cmake → .gitlab/ci/configure_fedora39_ninja_multi.cmake


+ 1 - 1
.gitlab/ci/configure_fedora38_ninja_clang.cmake → .gitlab/ci/configure_fedora39_ninja_multi_clang.cmake

@@ -1,4 +1,4 @@
 set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "")
 set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "")
 
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake")

+ 0 - 0
.gitlab/ci/configure_fedora38_sphinx.cmake → .gitlab/ci/configure_fedora39_sphinx.cmake


+ 0 - 0
.gitlab/ci/configure_fedora38_sphinx_package.cmake → .gitlab/ci/configure_fedora39_sphinx_package.cmake


+ 1 - 1
.gitlab/ci/configure_fedora38_tidy.cmake → .gitlab/ci/configure_fedora39_tidy.cmake

@@ -2,4 +2,4 @@ set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
 set(CMake_USE_CLANG_TIDY_MODULE ON CACHE BOOL "")
 set(CMake_CLANG_TIDY_MODULE "$ENV{CI_PROJECT_DIR}/Utilities/ClangTidyModule/build/libcmake-clang-tidy-module.so" CACHE FILEPATH "")
 
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")

+ 0 - 0
.gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp → .gitlab/ci/ctest_memcheck_fedora39_asan.lsan.supp


+ 0 - 4
.gitlab/ci/env_fedora38_common_clang.sh

@@ -1,4 +0,0 @@
-export CC=/usr/bin/clang-16
-export CXX=/usr/bin/clang++-16
-export FC=/usr/bin/flang-new
-export FFLAGS=-flang-experimental-exec

+ 0 - 1
.gitlab/ci/env_fedora38_hip_radeon.sh

@@ -1 +0,0 @@
-export HIPCXX=/usr/bin/clang++-16

+ 0 - 1
.gitlab/ci/env_fedora38_makefiles_clang.sh

@@ -1 +0,0 @@
-. .gitlab/ci/env_fedora38_common_clang.sh

+ 0 - 1
.gitlab/ci/env_fedora38_makefiles_symlinked.cmake

@@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/env_fedora38_makefiles.cmake")

+ 0 - 1
.gitlab/ci/env_fedora38_makefiles_symlinked.sh

@@ -1 +0,0 @@
-. .gitlab/ci/env_fedora38_makefiles.sh

+ 0 - 1
.gitlab/ci/env_fedora38_ninja_clang.sh

@@ -1 +0,0 @@
-. .gitlab/ci/env_fedora38_common_clang.sh

+ 0 - 1
.gitlab/ci/env_fedora38_ninja_multi_clang.sh

@@ -1 +0,0 @@
-. .gitlab/ci/env_fedora38_common_clang.sh

+ 0 - 0
.gitlab/ci/env_fedora38_asan.sh → .gitlab/ci/env_fedora39_asan.sh


+ 0 - 0
.gitlab/ci/env_fedora38_clang_analyzer.sh → .gitlab/ci/env_fedora39_clang_analyzer.sh


+ 3 - 0
.gitlab/ci/env_fedora39_common_clang.sh

@@ -0,0 +1,3 @@
+export CC=/usr/bin/clang-17
+export CXX=/usr/bin/clang++-17
+export FC=/usr/bin/flang-new

+ 0 - 0
.gitlab/ci/env_fedora38_extdeps.sh → .gitlab/ci/env_fedora39_extdeps.sh


+ 1 - 0
.gitlab/ci/env_fedora39_hip_radeon.sh

@@ -0,0 +1 @@
+export HIPCXX=/usr/bin/clang++-17

+ 0 - 0
.gitlab/ci/env_fedora38_makefiles.cmake → .gitlab/ci/env_fedora39_makefiles.cmake


+ 0 - 0
.gitlab/ci/env_fedora38_makefiles.sh → .gitlab/ci/env_fedora39_makefiles.sh


+ 1 - 0
.gitlab/ci/env_fedora39_makefiles_clang.sh

@@ -0,0 +1 @@
+. .gitlab/ci/env_fedora39_common_clang.sh

+ 1 - 0
.gitlab/ci/env_fedora39_makefiles_symlinked.cmake

@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/env_fedora39_makefiles.cmake")

+ 1 - 0
.gitlab/ci/env_fedora39_makefiles_symlinked.sh

@@ -0,0 +1 @@
+. .gitlab/ci/env_fedora39_makefiles.sh

+ 0 - 0
.gitlab/ci/env_fedora38_ninja.sh → .gitlab/ci/env_fedora39_ninja.sh


+ 1 - 0
.gitlab/ci/env_fedora39_ninja_clang.sh

@@ -0,0 +1 @@
+. .gitlab/ci/env_fedora39_common_clang.sh

+ 0 - 0
.gitlab/ci/env_fedora38_ninja_multi.sh → .gitlab/ci/env_fedora39_ninja_multi.sh


+ 1 - 0
.gitlab/ci/env_fedora39_ninja_multi_clang.sh

@@ -0,0 +1 @@
+. .gitlab/ci/env_fedora39_common_clang.sh

+ 0 - 0
.gitlab/ci/pre_build_fedora38_tidy.sh → .gitlab/ci/pre_build_fedora39_tidy.sh


+ 47 - 47
.gitlab/os-linux.yml

@@ -5,7 +5,7 @@
 ### Release
 
 .linux_prep_source:
-    image: "fedora:38"
+    image: "fedora:39"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -68,8 +68,8 @@
 
 ### Fedora
 
-.fedora38:
-    image: "kitware/cmake:ci-fedora38-x86_64-2023-08-07"
+.fedora39:
+    image: "kitware/cmake:ci-fedora39-x86_64-2023-11-16"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
@@ -77,37 +77,37 @@
 
 #### Lint builds
 
-.fedora38_tidy:
-    extends: .fedora38
+.fedora39_tidy:
+    extends: .fedora39
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_tidy
+        CMAKE_CONFIGURATION: fedora39_tidy
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_CI_NO_INSTALL: 1
 
-.fedora38_clang_analyzer:
-    extends: .fedora38
+.fedora39_clang_analyzer:
+    extends: .fedora39
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_clang_analyzer
+        CMAKE_CONFIGURATION: fedora39_clang_analyzer
         CMAKE_CI_BUILD_TYPE: Debug
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_CI_NO_INSTALL: 1
 
-.fedora38_sphinx:
-    extends: .fedora38
+.fedora39_sphinx:
+    extends: .fedora39
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_sphinx
+        CMAKE_CONFIGURATION: fedora39_sphinx
         CTEST_NO_WARNINGS_ALLOWED: 1
         CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
         CMAKE_CI_NO_INSTALL: 1
 
-.fedora38_sphinx_package:
-    extends: .fedora38
+.fedora39_sphinx_package:
+    extends: .fedora39
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_sphinx_package
+        CMAKE_CONFIGURATION: fedora39_sphinx_package
         CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
 
 #### Build and test
@@ -163,43 +163,43 @@
         CMAKE_CI_BUILD_TYPE: Release
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.fedora38_extdeps:
-    extends: .fedora38
+.fedora39_extdeps:
+    extends: .fedora39
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_extdeps
+        CMAKE_CONFIGURATION: fedora39_extdeps
         CMAKE_CI_BUILD_TYPE: Release
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.fedora38_ninja:
-    extends: .fedora38
+.fedora39_ninja:
+    extends: .fedora39
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_ninja
+        CMAKE_CONFIGURATION: fedora39_ninja
         CMAKE_CI_BUILD_TYPE: Release
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.fedora38_ninja_multi:
-    extends: .fedora38
+.fedora39_ninja_multi:
+    extends: .fedora39
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_ninja_multi
+        CMAKE_CONFIGURATION: fedora39_ninja_multi
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_GENERATOR: "Ninja Multi-Config"
 
-.fedora38_makefiles:
-    extends: .fedora38
+.fedora39_makefiles:
+    extends: .fedora39
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_makefiles
+        CMAKE_CONFIGURATION: fedora39_makefiles
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_GENERATOR: "Unix Makefiles"
 
-.fedora38_makefiles_symlinked:
-    extends: .fedora38
+.fedora39_makefiles_symlinked:
+    extends: .fedora39
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_makefiles_symlinked
+        CMAKE_CONFIGURATION: fedora39_makefiles_symlinked
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_GENERATOR: "Unix Makefiles"
         CMAKE_CI_IN_SYMLINK_TREE: 1
@@ -220,24 +220,24 @@
     variables:
         CMAKE_CONFIGURATION: debian12_ninja_clang
 
-.fedora38_makefiles_clang:
-    extends: .fedora38
+.fedora39_makefiles_clang:
+    extends: .fedora39
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_makefiles_clang
+        CMAKE_CONFIGURATION: fedora39_makefiles_clang
         CMAKE_GENERATOR: "Unix Makefiles"
 
-.fedora38_ninja_clang:
-    extends: .fedora38
+.fedora39_ninja_clang:
+    extends: .fedora39
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_ninja_clang
+        CMAKE_CONFIGURATION: fedora39_ninja_clang
 
-.fedora38_ninja_multi_clang:
-    extends: .fedora38
+.fedora39_ninja_multi_clang:
+    extends: .fedora39
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_ninja_multi_clang
+        CMAKE_CONFIGURATION: fedora39_ninja_multi_clang
         CMAKE_GENERATOR: "Ninja Multi-Config"
 
 ### Sanitizers
@@ -253,13 +253,13 @@
         CTEST_MEMORYCHECK_TYPE: AddressSanitizer
         CTEST_MEMORYCHECK_SANITIZER_OPTIONS: ""
 
-.fedora38_asan:
+.fedora39_asan:
     extends:
-        - .fedora38
+        - .fedora39
         - .fedora_asan_addon
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_asan
+        CMAKE_CONFIGURATION: fedora39_asan
 
 ### Intel Compiler
 
@@ -392,11 +392,11 @@
         CMAKE_CONFIGURATION: debian12_hip_radeon
         CTEST_LABELS: "HIP"
 
-.fedora38_hip_radeon:
-    extends: .fedora38
+.fedora39_hip_radeon:
+    extends: .fedora39
 
     variables:
-        CMAKE_CONFIGURATION: fedora38_hip_radeon
+        CMAKE_CONFIGURATION: fedora39_hip_radeon
         CTEST_LABELS: "HIP"
 
 .hip5.5_nvidia:
@@ -526,7 +526,7 @@
 
 .cmake_codespell_linux:
     stage: build
-    extends: .fedora38
+    extends: .fedora39
     script:
         - .gitlab/ci/codespell.sh
     interruptible: true
@@ -670,7 +670,7 @@
 .cmake_org_help:
     stage: build
     extends:
-        - .fedora38
+        - .fedora39
         - .linux_x86_64_tags
         - .cmake_org_help_artifacts
     script:

+ 2 - 2
.gitlab/upload.yml

@@ -1,7 +1,7 @@
 # Steps for uploading artifacts
 
 .rsync_upload_package:
-    image: "fedora:38"
+    image: "fedora:39"
     stage: upload
     tags:
         - cmake
@@ -21,7 +21,7 @@
 
 .rsync_upload_help:
     stage: upload
-    image: "fedora:38"
+    image: "fedora:39"
     tags:
         - cmake
         - docker