ci: use Fedora 40 images and environments

Leave the HIP-specific job on Fedora 39 for now. Issue: #25932
2024-04-23 14:04:36 -04:00 · 2024-04-23 14:04:36 -04:00 · 9c004ddb3d
commit 9c004ddb3d
parent 0f56cc9a4e
41 changed files with 107 additions and 106 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -59,7 +59,7 @@ p:source-package:

 p:doc-package:
    extends:
-        - .fedora39_sphinx_package
+        - .fedora40_sphinx_package
        - .cmake_prep_doc_linux
        - .linux_x86_64_tags
        - .cmake_doc_artifacts
@ -108,18 +108,18 @@ l:iwyu-debian12:
        - .cmake_cdash_artifacts
        - .run_automatically

-l:tidy-fedora39:
+l:tidy-fedora40:
    extends:
-        - .fedora39_tidy
+        - .fedora40_tidy
        - .cmake_build_linux
        - .cmake_tidy_artifacts
        - .linux_x86_64_tags
        - .cmake_cdash_artifacts
        - .run_automatically

-l:sphinx-fedora39:
+l:sphinx-fedora40:
    extends:
-        - .fedora39_sphinx
+        - .fedora40_sphinx
        - .cmake_build_linux
        - .cmake_sphinx_artifacts
        - .linux_x86_64_tags
@ -128,9 +128,9 @@ l:sphinx-fedora39:
        CMAKE_CI_JOB_CONTINUOUS: "true"
        CMAKE_CI_JOB_HELP: "true"

-l:clang-analyzer-fedora39:
+l:clang-analyzer-fedora40:
    extends:
-        - .fedora39_clang_analyzer
+        - .fedora40_clang_analyzer
        - .cmake_build_linux
        - .linux_x86_64_tags
        - .run_automatically
@ -234,9 +234,9 @@ t:fedora39-hip-radeon:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-t:fedora39-ninja-clang:
+t:fedora40-ninja-clang:
    extends:
-        - .fedora39_ninja_clang
+        - .fedora40_ninja_clang
        - .cmake_test_linux_release
        - .linux_x86_64_tags
        - .run_dependent
@ -244,9 +244,9 @@ t:fedora39-ninja-clang:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-t:fedora39-ninja-multi-clang:
+t:fedora40-ninja-multi-clang:
    extends:
-        - .fedora39_ninja_multi_clang
+        - .fedora40_ninja_multi_clang
        - .cmake_test_linux_release
        - .linux_x86_64_tags
        - .run_dependent
@ -254,9 +254,9 @@ t:fedora39-ninja-multi-clang:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-t:fedora39-makefiles-clang:
+t:fedora40-makefiles-clang:
    extends:
-        - .fedora39_makefiles_clang
+        - .fedora40_makefiles_clang
        - .cmake_test_linux_release
        - .linux_x86_64_tags
        - .run_dependent
@ -264,17 +264,17 @@ t:fedora39-makefiles-clang:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-t:fedora39-makefiles:
+t:fedora40-makefiles:
    extends:
-        - .fedora39_makefiles
+        - .fedora40_makefiles
        - .cmake_test_linux_release
        - .linux_x86_64_tags
        - .run_dependent
        - .needs_centos7_x86_64

-t:fedora39-makefiles-nospace:
+t:fedora40-makefiles-nospace:
    extends:
-        - .fedora39_makefiles
+        - .fedora40_makefiles
        - .cmake_test_linux_release
        - .linux_x86_64_tags
        - .cmake_junit_artifacts
@ -282,7 +282,7 @@ t:fedora39-makefiles-nospace:
        - .needs_centos7_x86_64
    variables:
        GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
-        CMAKE_CI_BUILD_NAME: fedora39_makefiles_nospace
+        CMAKE_CI_BUILD_NAME: fedora40_makefiles_nospace
        CMAKE_CI_JOB_NIGHTLY: "true"

 t:nvhpc22.11-ninja:
@ -437,9 +437,9 @@ t:debian10-legacy:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-b:fedora39-ninja:
+b:fedora40-ninja:
    extends:
-        - .fedora39_ninja
+        - .fedora40_ninja
        - .cmake_build_linux
        - .cmake_build_artifacts
        - .linux_x86_64_tags
@ -447,9 +447,9 @@ b:fedora39-ninja:
    variables:
        CMAKE_CI_JOB_CONTINUOUS: "true"

-b:fedora39-makefiles-symlinked:
+b:fedora40-makefiles-symlinked:
    extends:
-        - .fedora39_makefiles_symlinked
+        - .fedora40_makefiles_symlinked
        - .cmake_build_linux
        - .cmake_build_artifacts
        - .linux_x86_64_tags
@ -484,54 +484,54 @@ b:debian12-aarch64-extdeps:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-b:fedora39-extdeps:
+b:fedora40-extdeps:
    extends:
-        - .fedora39_extdeps
+        - .fedora40_extdeps
        - .cmake_build_linux_standalone
        - .linux_x86_64_tags
        - .run_manually
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-t:fedora39-ninja:
+t:fedora40-ninja:
    extends:
-        - .fedora39_ninja
+        - .fedora40_ninja
        - .cmake_test_linux
        - .linux_x86_64_tags_x11
        - .cmake_test_artifacts
        - .run_dependent
    dependencies:
-        - b:fedora39-ninja
+        - b:fedora40-ninja
    needs:
-        - b:fedora39-ninja
+        - b:fedora40-ninja
    variables:
        CMAKE_CI_JOB_CONTINUOUS: "true"

-t:fedora39-makefiles-symlinked:
+t:fedora40-makefiles-symlinked:
    extends:
-        - .fedora39_makefiles_symlinked
+        - .fedora40_makefiles_symlinked
        - .cmake_test_linux
        - .linux_x86_64_tags_x11
        - .cmake_test_artifacts
        - .run_dependent
    dependencies:
-        - b:fedora39-makefiles-symlinked
+        - b:fedora40-makefiles-symlinked
    needs:
-        - b:fedora39-makefiles-symlinked
+        - b:fedora40-makefiles-symlinked
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-t:fedora39-ninja-multi:
+t:fedora40-ninja-multi:
    extends:
-        - .fedora39_ninja_multi
+        - .fedora40_ninja_multi
        - .cmake_test_linux_external
        - .linux_x86_64_tags
        - .cmake_junit_artifacts
        - .run_dependent
    dependencies:
-        - t:fedora39-ninja
+        - t:fedora40-ninja
    needs:
-        - t:fedora39-ninja
+        - t:fedora40-ninja

 t:intel2016u2-makefiles:
    extends:
@ -786,9 +786,9 @@ u:linux-aarch64-package:

 ## Sanitizer builds

-b:fedora39-asan:
+b:fedora40-asan:
    extends:
-        - .fedora39_asan
+        - .fedora40_asan
        - .cmake_build_linux
        - .cmake_build_artifacts
        - .linux_x86_64_tags
@ -796,16 +796,16 @@ b:fedora39-asan:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-t:fedora39-asan:
+t:fedora40-asan:
    extends:
-        - .fedora39_asan
+        - .fedora40_asan
        - .cmake_memcheck_linux
        - .linux_x86_64_tags
        - .run_dependent
    dependencies:
-        - b:fedora39-asan
+        - b:fedora40-asan
    needs:
-        - b:fedora39-asan
+        - b:fedora40-asan
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

--- a/.gitlab/ci/configure_fedora39_clang_analyzer.cmake
+++ b/.gitlab/ci/configure_fedora39_clang_analyzer.cmake
@ -1,3 +0,0 @@
-set(configure_no_sccache 1)
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")
--- a/.gitlab/ci/configure_fedora40_asan.cmake
+++ b/.gitlab/ci/configure_fedora40_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_fedora39_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common.cmake")
--- a/.gitlab/ci/configure_fedora40_clang_analyzer.cmake
+++ b/.gitlab/ci/configure_fedora40_clang_analyzer.cmake
@ -0,0 +1,3 @@
+set(configure_no_sccache 1)
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common.cmake")
--- a/.gitlab/ci/configure_fedora40_common.cmake
+++ b/.gitlab/ci/configure_fedora40_common.cmake
--- a/.gitlab/ci/configure_fedora40_common_clang.cmake
+++ b/.gitlab/ci/configure_fedora40_common_clang.cmake
--- a/.gitlab/ci/configure_fedora40_extdeps.cmake
+++ b/.gitlab/ci/configure_fedora40_extdeps.cmake
--- a/.gitlab/ci/configure_fedora40_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora40_makefiles.cmake
--- a/.gitlab/ci/configure_fedora40_makefiles_clang.cmake
+++ b/.gitlab/ci/configure_fedora40_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_fedora39_common_clang.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common_clang.cmake")
--- a/.gitlab/ci/configure_fedora40_makefiles_symlinked.cmake
+++ b/.gitlab/ci/configure_fedora40_makefiles_symlinked.cmake
@ -1,2 +1,2 @@
 include("${CMAKE_CURRENT_LIST_DIR}/configure_symlinked_common.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common.cmake")
--- a/.gitlab/ci/configure_fedora40_ninja.cmake
+++ b/.gitlab/ci/configure_fedora40_ninja.cmake
@ -12,4 +12,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_fedora39_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common.cmake")
--- a/.gitlab/ci/configure_fedora40_ninja_clang.cmake
+++ b/.gitlab/ci/configure_fedora40_ninja_clang.cmake
@ -1,3 +1,3 @@
 set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "")

-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common_clang.cmake")
--- a/.gitlab/ci/configure_fedora40_ninja_multi.cmake
+++ b/.gitlab/ci/configure_fedora40_ninja_multi.cmake
--- a/.gitlab/ci/configure_fedora40_ninja_multi_clang.cmake
+++ b/.gitlab/ci/configure_fedora40_ninja_multi_clang.cmake
@ -1,3 +1,3 @@
 set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "")

-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common_clang.cmake")
--- a/.gitlab/ci/configure_fedora40_sphinx.cmake
+++ b/.gitlab/ci/configure_fedora40_sphinx.cmake
--- a/.gitlab/ci/configure_fedora40_sphinx_package.cmake
+++ b/.gitlab/ci/configure_fedora40_sphinx_package.cmake
--- a/.gitlab/ci/configure_fedora40_tidy.cmake
+++ b/.gitlab/ci/configure_fedora40_tidy.cmake
@ -3,4 +3,4 @@ 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 "")
 set(CMake_CLANG_TIDY_EXPORT_FIXES_DIR "$ENV{CI_PROJECT_DIR}/.gitlab/clang-tidy-fixes" CACHE PATH "")

-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common.cmake")
--- a/.gitlab/ci/ctest_memcheck_fedora40_asan.lsan.supp
+++ b/.gitlab/ci/ctest_memcheck_fedora40_asan.lsan.supp
--- a/.gitlab/ci/env_fedora39_common_clang.sh
+++ b/.gitlab/ci/env_fedora39_common_clang.sh
@ -1,3 +0,0 @@
-export CC=/usr/bin/clang-17
-export CXX=/usr/bin/clang++-17
-export FC=/usr/bin/flang-new
--- a/.gitlab/ci/env_fedora39_makefiles_clang.sh
+++ b/.gitlab/ci/env_fedora39_makefiles_clang.sh
@ -1 +0,0 @@
-. .gitlab/ci/env_fedora39_common_clang.sh
--- a/.gitlab/ci/env_fedora39_makefiles_symlinked.cmake
+++ b/.gitlab/ci/env_fedora39_makefiles_symlinked.cmake
@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/env_fedora39_makefiles.cmake")
--- a/.gitlab/ci/env_fedora39_makefiles_symlinked.sh
+++ b/.gitlab/ci/env_fedora39_makefiles_symlinked.sh
@ -1 +0,0 @@
-. .gitlab/ci/env_fedora39_makefiles.sh
--- a/.gitlab/ci/env_fedora39_ninja_clang.sh
+++ b/.gitlab/ci/env_fedora39_ninja_clang.sh
@ -1 +0,0 @@
-. .gitlab/ci/env_fedora39_common_clang.sh
--- a/.gitlab/ci/env_fedora39_ninja_multi_clang.sh
+++ b/.gitlab/ci/env_fedora39_ninja_multi_clang.sh
@ -1 +0,0 @@
-. .gitlab/ci/env_fedora39_common_clang.sh
--- a/.gitlab/ci/env_fedora40_asan.sh
+++ b/.gitlab/ci/env_fedora40_asan.sh
--- a/.gitlab/ci/env_fedora40_clang_analyzer.sh
+++ b/.gitlab/ci/env_fedora40_clang_analyzer.sh
--- a/.gitlab/ci/env_fedora40_common_clang.sh
+++ b/.gitlab/ci/env_fedora40_common_clang.sh
@ -0,0 +1,3 @@
+export CC=/usr/bin/clang-18
+export CXX=/usr/bin/clang++-18
+export FC=/usr/bin/flang-new
--- a/.gitlab/ci/env_fedora40_extdeps.sh
+++ b/.gitlab/ci/env_fedora40_extdeps.sh
--- a/.gitlab/ci/env_fedora40_makefiles.cmake
+++ b/.gitlab/ci/env_fedora40_makefiles.cmake
--- a/.gitlab/ci/env_fedora40_makefiles.sh
+++ b/.gitlab/ci/env_fedora40_makefiles.sh
--- a/.gitlab/ci/env_fedora40_makefiles_clang.sh
+++ b/.gitlab/ci/env_fedora40_makefiles_clang.sh
@ -0,0 +1 @@
+. .gitlab/ci/env_fedora40_common_clang.sh
--- a/.gitlab/ci/env_fedora40_makefiles_symlinked.cmake
+++ b/.gitlab/ci/env_fedora40_makefiles_symlinked.cmake
@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/env_fedora40_makefiles.cmake")
--- a/.gitlab/ci/env_fedora40_makefiles_symlinked.sh
+++ b/.gitlab/ci/env_fedora40_makefiles_symlinked.sh
@ -0,0 +1 @@
+. .gitlab/ci/env_fedora40_makefiles.sh
--- a/.gitlab/ci/env_fedora40_ninja.sh
+++ b/.gitlab/ci/env_fedora40_ninja.sh
--- a/.gitlab/ci/env_fedora40_ninja_clang.sh
+++ b/.gitlab/ci/env_fedora40_ninja_clang.sh
@ -0,0 +1 @@
+. .gitlab/ci/env_fedora40_common_clang.sh
--- a/.gitlab/ci/env_fedora40_ninja_multi.sh
+++ b/.gitlab/ci/env_fedora40_ninja_multi.sh
--- a/.gitlab/ci/env_fedora40_ninja_multi_clang.sh
+++ b/.gitlab/ci/env_fedora40_ninja_multi_clang.sh
@ -0,0 +1 @@
+. .gitlab/ci/env_fedora40_common_clang.sh
--- a/.gitlab/ci/post_build_fedora40_tidy.sh
+++ b/.gitlab/ci/post_build_fedora40_tidy.sh
--- a/.gitlab/ci/pre_build_fedora40_tidy.sh
+++ b/.gitlab/ci/pre_build_fedora40_tidy.sh
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@ -5,7 +5,7 @@
 ### Release

 .linux_prep_source:
-    image: "fedora:39"
+    image: "fedora:40"

    variables:
        GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@ -68,13 +68,14 @@

 ### Fedora

-.fedora39:
-    image: "kitware/cmake:ci-fedora39-x86_64-2024-04-10"
+.fedora40:
+    image: "kitware/cmake:ci-fedora40-x86_64-2024-04-24"

    variables:
        GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
        CMAKE_ARCH: x86_64

+# FIXME(#25932): Our HIP tests do not fully work in CI with Fedora 40.
 .fedora39_hip:
    image: "kitware/cmake:ci-fedora39-hip-x86_64-2024-04-24"

@ -84,36 +85,36 @@

 #### Lint builds

-.fedora39_tidy:
-    extends: .fedora39
+.fedora40_tidy:
+    extends: .fedora40

    variables:
-        CMAKE_CONFIGURATION: fedora39_tidy
+        CMAKE_CONFIGURATION: fedora40_tidy
        CMAKE_CI_NO_INSTALL: 1

-.fedora39_clang_analyzer:
-    extends: .fedora39
+.fedora40_clang_analyzer:
+    extends: .fedora40

    variables:
-        CMAKE_CONFIGURATION: fedora39_clang_analyzer
+        CMAKE_CONFIGURATION: fedora40_clang_analyzer
        CMAKE_CI_BUILD_TYPE: Debug
        CTEST_NO_WARNINGS_ALLOWED: 1
        CMAKE_CI_NO_INSTALL: 1

-.fedora39_sphinx:
-    extends: .fedora39
+.fedora40_sphinx:
+    extends: .fedora40

    variables:
-        CMAKE_CONFIGURATION: fedora39_sphinx
+        CMAKE_CONFIGURATION: fedora40_sphinx
        CTEST_NO_WARNINGS_ALLOWED: 1
        CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
        CMAKE_CI_NO_INSTALL: 1

-.fedora39_sphinx_package:
-    extends: .fedora39
+.fedora40_sphinx_package:
+    extends: .fedora40

    variables:
-        CMAKE_CONFIGURATION: fedora39_sphinx_package
+        CMAKE_CONFIGURATION: fedora40_sphinx_package
        CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"

 #### Build and test
@ -169,43 +170,43 @@
        CMAKE_CI_BUILD_TYPE: Release
        CTEST_NO_WARNINGS_ALLOWED: 1

-.fedora39_extdeps:
-    extends: .fedora39
+.fedora40_extdeps:
+    extends: .fedora40

    variables:
-        CMAKE_CONFIGURATION: fedora39_extdeps
+        CMAKE_CONFIGURATION: fedora40_extdeps
        CMAKE_CI_BUILD_TYPE: Release
        CTEST_NO_WARNINGS_ALLOWED: 1

-.fedora39_ninja:
-    extends: .fedora39
+.fedora40_ninja:
+    extends: .fedora40

    variables:
-        CMAKE_CONFIGURATION: fedora39_ninja
+        CMAKE_CONFIGURATION: fedora40_ninja
        CMAKE_CI_BUILD_TYPE: Release
        CTEST_NO_WARNINGS_ALLOWED: 1

-.fedora39_ninja_multi:
-    extends: .fedora39
+.fedora40_ninja_multi:
+    extends: .fedora40

    variables:
-        CMAKE_CONFIGURATION: fedora39_ninja_multi
+        CMAKE_CONFIGURATION: fedora40_ninja_multi
        CTEST_NO_WARNINGS_ALLOWED: 1
        CMAKE_GENERATOR: "Ninja Multi-Config"

-.fedora39_makefiles:
-    extends: .fedora39
+.fedora40_makefiles:
+    extends: .fedora40

    variables:
-        CMAKE_CONFIGURATION: fedora39_makefiles
+        CMAKE_CONFIGURATION: fedora40_makefiles
        CTEST_NO_WARNINGS_ALLOWED: 1
        CMAKE_GENERATOR: "Unix Makefiles"

-.fedora39_makefiles_symlinked:
-    extends: .fedora39
+.fedora40_makefiles_symlinked:
+    extends: .fedora40

    variables:
-        CMAKE_CONFIGURATION: fedora39_makefiles_symlinked
+        CMAKE_CONFIGURATION: fedora40_makefiles_symlinked
        CTEST_NO_WARNINGS_ALLOWED: 1
        CMAKE_GENERATOR: "Unix Makefiles"
        CMAKE_CI_IN_SYMLINK_TREE: 1
@ -226,24 +227,24 @@
    variables:
        CMAKE_CONFIGURATION: debian12_ninja_clang

-.fedora39_makefiles_clang:
-    extends: .fedora39
+.fedora40_makefiles_clang:
+    extends: .fedora40

    variables:
-        CMAKE_CONFIGURATION: fedora39_makefiles_clang
+        CMAKE_CONFIGURATION: fedora40_makefiles_clang
        CMAKE_GENERATOR: "Unix Makefiles"

-.fedora39_ninja_clang:
-    extends: .fedora39
+.fedora40_ninja_clang:
+    extends: .fedora40

    variables:
-        CMAKE_CONFIGURATION: fedora39_ninja_clang
+        CMAKE_CONFIGURATION: fedora40_ninja_clang

-.fedora39_ninja_multi_clang:
-    extends: .fedora39
+.fedora40_ninja_multi_clang:
+    extends: .fedora40

    variables:
-        CMAKE_CONFIGURATION: fedora39_ninja_multi_clang
+        CMAKE_CONFIGURATION: fedora40_ninja_multi_clang
        CMAKE_GENERATOR: "Ninja Multi-Config"

 ### Sanitizers
@ -259,13 +260,13 @@
        CTEST_MEMORYCHECK_TYPE: AddressSanitizer
        CTEST_MEMORYCHECK_SANITIZER_OPTIONS: ""

-.fedora39_asan:
+.fedora40_asan:
    extends:
-        - .fedora39
+        - .fedora40
        - .fedora_asan_addon

    variables:
-        CMAKE_CONFIGURATION: fedora39_asan
+        CMAKE_CONFIGURATION: fedora40_asan

 ### Intel Compiler

@ -546,7 +547,7 @@

 .cmake_codespell_linux:
    stage: build
-    extends: .fedora39
+    extends: .fedora40
    script:
        - .gitlab/ci/codespell.sh
    interruptible: true
@ -689,7 +690,7 @@
 .cmake_org_help:
    stage: build
    extends:
-        - .fedora39
+        - .fedora40
        - .linux_x86_64_tags
        - .cmake_org_help_artifacts
    script:
--- a/.gitlab/upload.yml
+++ b/.gitlab/upload.yml
@ -1,7 +1,7 @@
 # Steps for uploading artifacts

 .rsync_upload_package:
-    image: "fedora:39"
+    image: "fedora:40"
    stage: upload
    tags:
        - cmake
@ -21,7 +21,7 @@

 .rsync_upload_help:
    stage: upload
-    image: "fedora:39"
+    image: "fedora:40"
    tags:
        - cmake
        - docker
				`@ -1 +0,0 @@`
				`include("${CMAKE_CURRENT_LIST_DIR}/env_fedora39_makefiles.cmake")`
				`@ -0,0 +1 @@`
				`include("${CMAKE_CURRENT_LIST_DIR}/env_fedora40_makefiles.cmake")`