ci: use Fedora 41 images and environments

2024-10-23 14:18:13 -04:00 · 2024-10-23 14:18:13 -04:00 · c8591c61d8
commit c8591c61d8
parent 46d89b8524
51 changed files with 121 additions and 123 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -59,7 +59,7 @@ p:source-package:

 p:doc-package:
    extends:
-        - .fedora40_sphinx_package
+        - .fedora41_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-fedora40:
+l:tidy-fedora41:
    extends:
-        - .fedora40_tidy
+        - .fedora41_tidy
        - .cmake_build_linux
        - .cmake_tidy_artifacts
        - .linux_x86_64_tags
        - .cmake_cdash_artifacts
        - .run_automatically

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

-l:clang-analyzer-fedora40:
+l:clang-analyzer-fedora41:
    extends:
-        - .fedora40_clang_analyzer
+        - .fedora41_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:fedora40-makefiles-lfortran:
+t:fedora41-makefiles-lfortran:
    extends:
-        - .fedora40_makefiles_lfortran
+        - .fedora41_makefiles_lfortran
        - .cmake_test_linux_release
        - .linux_x86_64_tags
        - .run_dependent
@ -244,9 +244,9 @@ t:fedora40-makefiles-lfortran:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-t:fedora40-ninja-lfortran:
+t:fedora41-ninja-lfortran:
    extends:
-        - .fedora40_ninja_lfortran
+        - .fedora41_ninja_lfortran
        - .cmake_test_linux_release
        - .linux_x86_64_tags
        - .run_dependent
@ -254,9 +254,9 @@ t:fedora40-ninja-lfortran:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-t:fedora40-ninja-clang:
+t:fedora41-ninja-clang:
    extends:
-        - .fedora40_ninja_clang
+        - .fedora41_ninja_clang
        - .cmake_test_linux_release
        - .linux_x86_64_tags
        - .run_dependent
@ -264,9 +264,9 @@ t:fedora40-ninja-clang:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-t:fedora40-ninja-multi-clang:
+t:fedora41-ninja-multi-clang:
    extends:
-        - .fedora40_ninja_multi_clang
+        - .fedora41_ninja_multi_clang
        - .cmake_test_linux_release
        - .linux_x86_64_tags
        - .run_dependent
@ -274,9 +274,9 @@ t:fedora40-ninja-multi-clang:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-t:fedora40-makefiles-clang:
+t:fedora41-makefiles-clang:
    extends:
-        - .fedora40_makefiles_clang
+        - .fedora41_makefiles_clang
        - .cmake_test_linux_release
        - .linux_x86_64_tags
        - .run_dependent
@ -284,17 +284,17 @@ t:fedora40-makefiles-clang:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-t:fedora40-makefiles:
+t:fedora41-makefiles:
    extends:
-        - .fedora40_makefiles
+        - .fedora41_makefiles
        - .cmake_test_linux_release
        - .linux_x86_64_v3_tags
        - .run_dependent
        - .needs_centos7_x86_64

-t:fedora40-makefiles-nospace:
+t:fedora41-makefiles-nospace:
    extends:
-        - .fedora40_makefiles
+        - .fedora41_makefiles
        - .cmake_test_linux_release
        - .linux_x86_64_v3_tags
        - .cmake_junit_artifacts
@ -302,7 +302,7 @@ t:fedora40-makefiles-nospace:
        - .needs_centos7_x86_64
    variables:
        GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
-        CMAKE_CI_BUILD_NAME: fedora40_makefiles_nospace
+        CMAKE_CI_BUILD_NAME: fedora41_makefiles_nospace
        CMAKE_CI_JOB_NIGHTLY: "true"

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

-b:fedora40-ninja:
+b:fedora41-ninja:
    extends:
-        - .fedora40_ninja
+        - .fedora41_ninja
        - .cmake_build_linux
        - .cmake_build_artifacts
        - .linux_x86_64_tags
@ -458,9 +458,9 @@ b:fedora40-ninja:
    variables:
        CMAKE_CI_JOB_CONTINUOUS: "true"

-b:fedora40-makefiles-symlinked:
+b:fedora41-makefiles-symlinked:
    extends:
-        - .fedora40_makefiles_symlinked
+        - .fedora41_makefiles_symlinked
        - .cmake_build_linux
        - .cmake_build_artifacts
        - .linux_x86_64_tags
@ -495,54 +495,54 @@ b:debian12-aarch64-extdeps:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

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

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

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

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

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

 ## Sanitizer builds

-b:fedora40-asan:
+b:fedora41-asan:
    extends:
-        - .fedora40_asan
+        - .fedora41_asan
        - .cmake_build_linux
        - .cmake_build_artifacts
        - .linux_x86_64_tags
@ -807,16 +807,16 @@ b:fedora40-asan:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

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

--- a/.gitlab/ci/configure_fedora40_clang_analyzer.cmake
+++ b/.gitlab/ci/configure_fedora40_clang_analyzer.cmake
@ -1,3 +0,0 @@
-set(configure_no_sccache 1)
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common.cmake")
--- a/.gitlab/ci/configure_fedora40_makefiles_lfortran.cmake
+++ b/.gitlab/ci/configure_fedora40_makefiles_lfortran.cmake
@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common_lfortran.cmake")
--- a/.gitlab/ci/configure_fedora40_ninja_lfortran.cmake
+++ b/.gitlab/ci/configure_fedora40_ninja_lfortran.cmake
@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common_lfortran.cmake")
--- a/.gitlab/ci/configure_fedora41_asan.cmake
+++ b/.gitlab/ci/configure_fedora41_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_fedora40_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake")
--- a/.gitlab/ci/configure_fedora41_clang_analyzer.cmake
+++ b/.gitlab/ci/configure_fedora41_clang_analyzer.cmake
@ -0,0 +1,3 @@
+set(configure_no_sccache 1)
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake")
--- a/.gitlab/ci/configure_fedora41_common.cmake
+++ b/.gitlab/ci/configure_fedora41_common.cmake
--- a/.gitlab/ci/configure_fedora41_common_clang.cmake
+++ b/.gitlab/ci/configure_fedora41_common_clang.cmake
@ -11,7 +11,7 @@ set(CMake_TEST_FindOpenACC_CXX "ON" CACHE BOOL "")
 set(CMake_TEST_FindOpenACC_Fortran "OFF" CACHE BOOL "") # flang-new fails producing LLVM IR
 set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "")
 set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "")
-set(CMake_TEST_FindOpenMP_Fortran "ON" CACHE BOOL "")
+set(CMake_TEST_FindOpenMP_Fortran "OFF" CACHE BOOL "") # https://bugzilla.redhat.com/show_bug.cgi?id=2321571
 set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "")

 include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")
--- a/.gitlab/ci/configure_fedora41_common_lfortran.cmake
+++ b/.gitlab/ci/configure_fedora41_common_lfortran.cmake
--- a/.gitlab/ci/configure_fedora41_extdeps.cmake
+++ b/.gitlab/ci/configure_fedora41_extdeps.cmake
--- a/.gitlab/ci/configure_fedora41_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora41_makefiles.cmake
@ -83,9 +83,7 @@ set(CMake_TEST_FindPNG "ON" CACHE BOOL "")
 set(CMake_TEST_FindPostgreSQL "ON" CACHE BOOL "")
 set(CMake_TEST_FindProtobuf "ON" CACHE BOOL "")
 set(CMake_TEST_FindProtobuf_gRPC "ON" CACHE BOOL "")
-set(CMake_TEST_FindPython2 "ON" CACHE BOOL "")
 set(CMake_TEST_FindPython3 "ON" CACHE BOOL "")
-set(CMake_TEST_FindPython2_NumPy "ON" CACHE BOOL "")
 set(CMake_TEST_FindPython3_NumPy "ON" CACHE BOOL "")
 set(CMake_TEST_FindPython2_PyPy "ON" CACHE BOOL "")
 set(CMake_TEST_FindPython3_PyPy "ON" CACHE BOOL "")
--- a/.gitlab/ci/configure_fedora41_makefiles_clang.cmake
+++ b/.gitlab/ci/configure_fedora41_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_fedora40_common_clang.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_clang.cmake")
--- a/.gitlab/ci/configure_fedora41_makefiles_lfortran.cmake
+++ b/.gitlab/ci/configure_fedora41_makefiles_lfortran.cmake
@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_lfortran.cmake")
--- a/.gitlab/ci/configure_fedora41_makefiles_symlinked.cmake
+++ b/.gitlab/ci/configure_fedora41_makefiles_symlinked.cmake
@ -1,2 +1,2 @@
 include("${CMAKE_CURRENT_LIST_DIR}/configure_symlinked_common.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake")
--- a/.gitlab/ci/configure_fedora41_ninja.cmake
+++ b/.gitlab/ci/configure_fedora41_ninja.cmake
@ -15,4 +15,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_fedora40_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake")
--- a/.gitlab/ci/configure_fedora41_ninja_clang.cmake
+++ b/.gitlab/ci/configure_fedora41_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,build_database" CACHE STRING "")

-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common_clang.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_clang.cmake")
--- a/.gitlab/ci/configure_fedora41_ninja_lfortran.cmake
+++ b/.gitlab/ci/configure_fedora41_ninja_lfortran.cmake
@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_lfortran.cmake")
--- a/.gitlab/ci/configure_fedora41_ninja_multi.cmake
+++ b/.gitlab/ci/configure_fedora41_ninja_multi.cmake
--- a/.gitlab/ci/configure_fedora41_ninja_multi_clang.cmake
+++ b/.gitlab/ci/configure_fedora41_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,build_database" CACHE STRING "")

-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common_clang.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_clang.cmake")
--- a/.gitlab/ci/configure_fedora41_sphinx.cmake
+++ b/.gitlab/ci/configure_fedora41_sphinx.cmake
--- a/.gitlab/ci/configure_fedora41_sphinx_package.cmake
+++ b/.gitlab/ci/configure_fedora41_sphinx_package.cmake
--- a/.gitlab/ci/configure_fedora41_tidy.cmake
+++ b/.gitlab/ci/configure_fedora41_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_fedora40_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake")
--- a/.gitlab/ci/ctest_memcheck_fedora41_asan.lsan.supp
+++ b/.gitlab/ci/ctest_memcheck_fedora41_asan.lsan.supp
--- a/.gitlab/ci/env_fedora40_common_clang.sh
+++ b/.gitlab/ci/env_fedora40_common_clang.sh
@ -1,3 +0,0 @@
-export CC=/usr/bin/clang-18
-export CXX=/usr/bin/clang++-18
-export FC=/usr/bin/flang-new
--- a/.gitlab/ci/env_fedora40_makefiles_clang.sh
+++ b/.gitlab/ci/env_fedora40_makefiles_clang.sh
@ -1 +0,0 @@
-. .gitlab/ci/env_fedora40_common_clang.sh
--- a/.gitlab/ci/env_fedora40_makefiles_lfortran.sh
+++ b/.gitlab/ci/env_fedora40_makefiles_lfortran.sh
@ -1 +0,0 @@
-. .gitlab/ci/env_fedora40_common_lfortran.sh
--- a/.gitlab/ci/env_fedora40_makefiles_symlinked.cmake
+++ b/.gitlab/ci/env_fedora40_makefiles_symlinked.cmake
@ -1 +0,0 @@
-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
@ -1 +0,0 @@
-. .gitlab/ci/env_fedora40_makefiles.sh
--- a/.gitlab/ci/env_fedora40_ninja_clang.sh
+++ b/.gitlab/ci/env_fedora40_ninja_clang.sh
@ -1 +0,0 @@
-. .gitlab/ci/env_fedora40_common_clang.sh
--- a/.gitlab/ci/env_fedora40_ninja_lfortran.sh
+++ b/.gitlab/ci/env_fedora40_ninja_lfortran.sh
@ -1 +0,0 @@
-. .gitlab/ci/env_fedora40_common_lfortran.sh
--- a/.gitlab/ci/env_fedora40_ninja_multi_clang.sh
+++ b/.gitlab/ci/env_fedora40_ninja_multi_clang.sh
@ -1 +0,0 @@
-. .gitlab/ci/env_fedora40_common_clang.sh
--- a/.gitlab/ci/env_fedora41_asan.sh
+++ b/.gitlab/ci/env_fedora41_asan.sh
--- a/.gitlab/ci/env_fedora41_clang_analyzer.sh
+++ b/.gitlab/ci/env_fedora41_clang_analyzer.sh
--- a/.gitlab/ci/env_fedora41_common_clang.sh
+++ b/.gitlab/ci/env_fedora41_common_clang.sh
@ -0,0 +1,3 @@
+export CC=/usr/bin/clang-19
+export CXX=/usr/bin/clang++-19
+export FC=/usr/bin/flang-new
--- a/.gitlab/ci/env_fedora41_common_lfortran.sh
+++ b/.gitlab/ci/env_fedora41_common_lfortran.sh
--- a/.gitlab/ci/env_fedora41_extdeps.sh
+++ b/.gitlab/ci/env_fedora41_extdeps.sh
--- a/.gitlab/ci/env_fedora41_makefiles.cmake
+++ b/.gitlab/ci/env_fedora41_makefiles.cmake
--- a/.gitlab/ci/env_fedora41_makefiles.sh
+++ b/.gitlab/ci/env_fedora41_makefiles.sh
--- a/.gitlab/ci/env_fedora41_makefiles_clang.sh
+++ b/.gitlab/ci/env_fedora41_makefiles_clang.sh
@ -0,0 +1 @@
+. .gitlab/ci/env_fedora41_common_clang.sh
--- a/.gitlab/ci/env_fedora41_makefiles_lfortran.sh
+++ b/.gitlab/ci/env_fedora41_makefiles_lfortran.sh
@ -0,0 +1 @@
+. .gitlab/ci/env_fedora41_common_lfortran.sh
--- a/.gitlab/ci/env_fedora41_makefiles_symlinked.cmake
+++ b/.gitlab/ci/env_fedora41_makefiles_symlinked.cmake
@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/env_fedora41_makefiles.cmake")
--- a/.gitlab/ci/env_fedora41_makefiles_symlinked.sh
+++ b/.gitlab/ci/env_fedora41_makefiles_symlinked.sh
@ -0,0 +1 @@
+. .gitlab/ci/env_fedora41_makefiles.sh
--- a/.gitlab/ci/env_fedora41_ninja.sh
+++ b/.gitlab/ci/env_fedora41_ninja.sh
--- a/.gitlab/ci/env_fedora41_ninja_clang.sh
+++ b/.gitlab/ci/env_fedora41_ninja_clang.sh
@ -0,0 +1 @@
+. .gitlab/ci/env_fedora41_common_clang.sh
--- a/.gitlab/ci/env_fedora41_ninja_lfortran.sh
+++ b/.gitlab/ci/env_fedora41_ninja_lfortran.sh
@ -0,0 +1 @@
+. .gitlab/ci/env_fedora41_common_lfortran.sh
--- a/.gitlab/ci/env_fedora41_ninja_multi.sh
+++ b/.gitlab/ci/env_fedora41_ninja_multi.sh
--- a/.gitlab/ci/env_fedora41_ninja_multi_clang.sh
+++ b/.gitlab/ci/env_fedora41_ninja_multi_clang.sh
@ -0,0 +1 @@
+. .gitlab/ci/env_fedora41_common_clang.sh
--- a/.gitlab/ci/post_build_fedora41_tidy.sh
+++ b/.gitlab/ci/post_build_fedora41_tidy.sh
--- a/.gitlab/ci/pre_build_fedora41_tidy.sh
+++ b/.gitlab/ci/pre_build_fedora41_tidy.sh
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@ -5,7 +5,7 @@
 ### Release

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

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

 ### Fedora

-.fedora40:
-    image: "kitware/cmake:ci-fedora40-x86_64-2024-07-23"
+.fedora41:
+    image: "kitware/cmake:ci-fedora41-x86_64-2024-10-23"

    variables:
        GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
@ -85,36 +85,36 @@

 #### Lint builds

-.fedora40_tidy:
-    extends: .fedora40
+.fedora41_tidy:
+    extends: .fedora41

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

-.fedora40_clang_analyzer:
-    extends: .fedora40
+.fedora41_clang_analyzer:
+    extends: .fedora41

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

-.fedora40_sphinx:
-    extends: .fedora40
+.fedora41_sphinx:
+    extends: .fedora41

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

-.fedora40_sphinx_package:
-    extends: .fedora40
+.fedora41_sphinx_package:
+    extends: .fedora41

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

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

-.fedora40_extdeps:
-    extends: .fedora40
+.fedora41_extdeps:
+    extends: .fedora41

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

-.fedora40_ninja:
-    extends: .fedora40
+.fedora41_ninja:
+    extends: .fedora41

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

-.fedora40_ninja_multi:
-    extends: .fedora40
+.fedora41_ninja_multi:
+    extends: .fedora41

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

-.fedora40_makefiles:
-    extends: .fedora40
+.fedora41_makefiles:
+    extends: .fedora41

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

-.fedora40_makefiles_symlinked:
-    extends: .fedora40
+.fedora41_makefiles_symlinked:
+    extends: .fedora41

    variables:
-        CMAKE_CONFIGURATION: fedora40_makefiles_symlinked
+        CMAKE_CONFIGURATION: fedora41_makefiles_symlinked
        CTEST_NO_WARNINGS_ALLOWED: 1
        CMAKE_GENERATOR: "Unix Makefiles"
        CMAKE_CI_IN_SYMLINK_TREE: 1
@ -227,43 +227,43 @@
    variables:
        CMAKE_CONFIGURATION: debian12_ninja_clang

-.fedora40_makefiles_clang:
-    extends: .fedora40
+.fedora41_makefiles_clang:
+    extends: .fedora41

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

-.fedora40_makefiles_lfortran:
-    extends: .fedora40
+.fedora41_makefiles_lfortran:
+    extends: .fedora41

    variables:
        # FIXME(lfortran): -rpath flags with spaces not forwarded
        GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
-        CMAKE_CONFIGURATION: fedora40_makefiles_lfortran
+        CMAKE_CONFIGURATION: fedora41_makefiles_lfortran
        CMAKE_GENERATOR: "Unix Makefiles"
        CTEST_LABELS: "Fortran"

-.fedora40_ninja_lfortran:
-    extends: .fedora40
+.fedora41_ninja_lfortran:
+    extends: .fedora41

    variables:
        # FIXME(lfortran): -rpath flags with spaces not forwarded
        GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
-        CMAKE_CONFIGURATION: fedora40_ninja_lfortran
+        CMAKE_CONFIGURATION: fedora41_ninja_lfortran
        CTEST_LABELS: "Fortran"

-.fedora40_ninja_clang:
-    extends: .fedora40
+.fedora41_ninja_clang:
+    extends: .fedora41

    variables:
-        CMAKE_CONFIGURATION: fedora40_ninja_clang
+        CMAKE_CONFIGURATION: fedora41_ninja_clang

-.fedora40_ninja_multi_clang:
-    extends: .fedora40
+.fedora41_ninja_multi_clang:
+    extends: .fedora41

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

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

-.fedora40_asan:
+.fedora41_asan:
    extends:
-        - .fedora40
+        - .fedora41
        - .fedora_asan_addon

    variables:
-        CMAKE_CONFIGURATION: fedora40_asan
+        CMAKE_CONFIGURATION: fedora41_asan

 ### Intel Compiler

@ -555,7 +555,7 @@

 .cmake_codespell_linux:
    stage: build
-    extends: .fedora40
+    extends: .fedora41
    script:
        - .gitlab/ci/codespell.sh
    interruptible: true
@ -698,7 +698,7 @@
 .cmake_org_help:
    stage: build
    extends:
-        - .fedora40
+        - .fedora41
        - .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:40"
+    image: "fedora:41"
    stage: upload
    tags:
        - cmake
@ -21,7 +21,7 @@

 .rsync_upload_help:
    stage: upload
-    image: "fedora:40"
+    image: "fedora:41"
    tags:
        - cmake
        - docker
				`@ -1 +0,0 @@`
				`include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora40_common_lfortran.cmake")`
				`@ -0,0 +1 @@`
				`include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_lfortran.cmake")`
				`@ -1 +0,0 @@`
				`. .gitlab/ci/env_fedora40_common_lfortran.sh`
				`@ -1 +0,0 @@`
				`include("${CMAKE_CURRENT_LIST_DIR}/env_fedora40_makefiles.cmake")`
				`@ -0,0 +1 @@`
				`. .gitlab/ci/env_fedora41_common_lfortran.sh`