From 5b21de16a00a80742fac69f39a038945499ead94 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 22 Apr 2025 13:57:18 -0400 Subject: [PATCH] ci: use Fedora 42 images and environments --- .gitlab-ci.yml | 88 +++++++------- ...onfigure_fedora41_makefiles_lfortran.cmake | 1 - .../configure_fedora41_ninja_lfortran.cmake | 1 - ...an.cmake => configure_fedora42_asan.cmake} | 2 +- ...> configure_fedora42_clang_analyzer.cmake} | 2 +- ....cmake => configure_fedora42_common.cmake} | 0 ... => configure_fedora42_common_clang.cmake} | 0 ... configure_fedora42_common_lfortran.cmake} | 0 ...cmake => configure_fedora42_extdeps.cmake} | 0 ...ke => configure_fedora42_hip_radeon.cmake} | 0 ...ake => configure_fedora42_makefiles.cmake} | 0 ... configure_fedora42_makefiles_clang.cmake} | 2 +- ...onfigure_fedora42_makefiles_lfortran.cmake | 1 + ...figure_fedora42_makefiles_symlinked.cmake} | 2 +- ...a.cmake => configure_fedora42_ninja.cmake} | 2 +- ...e => configure_fedora42_ninja_clang.cmake} | 2 +- .../configure_fedora42_ninja_lfortran.cmake | 1 + ...e => configure_fedora42_ninja_multi.cmake} | 0 ...onfigure_fedora42_ninja_multi_clang.cmake} | 2 +- ....cmake => configure_fedora42_sphinx.cmake} | 0 ...> configure_fedora42_sphinx_package.cmake} | 0 ...dy.cmake => configure_fedora42_tidy.cmake} | 2 +- ...=> ctest_memcheck_fedora42_asan.lsan.supp} | 0 .gitlab/ci/env_fedora41_common_clang.sh | 3 - .gitlab/ci/env_fedora41_hip_radeon.sh | 1 - .gitlab/ci/env_fedora41_makefiles_clang.sh | 1 - .gitlab/ci/env_fedora41_makefiles_lfortran.sh | 1 - .../ci/env_fedora41_makefiles_symlinked.cmake | 1 - .../ci/env_fedora41_makefiles_symlinked.sh | 1 - .gitlab/ci/env_fedora41_ninja_clang.sh | 1 - .gitlab/ci/env_fedora41_ninja_lfortran.sh | 1 - .gitlab/ci/env_fedora41_ninja_multi_clang.sh | 1 - ..._fedora41_asan.sh => env_fedora42_asan.sh} | 0 ...yzer.sh => env_fedora42_clang_analyzer.sh} | 0 .gitlab/ci/env_fedora42_common_clang.sh | 3 + ...ran.sh => env_fedora42_common_lfortran.sh} | 0 ...a41_extdeps.sh => env_fedora42_extdeps.sh} | 0 .gitlab/ci/env_fedora42_hip_radeon.sh | 2 + ...les.cmake => env_fedora42_makefiles.cmake} | 0 ...makefiles.sh => env_fedora42_makefiles.sh} | 0 .gitlab/ci/env_fedora42_makefiles_clang.sh | 1 + .gitlab/ci/env_fedora42_makefiles_lfortran.sh | 1 + .../ci/env_fedora42_makefiles_symlinked.cmake | 1 + .../ci/env_fedora42_makefiles_symlinked.sh | 1 + ...edora41_ninja.sh => env_fedora42_ninja.sh} | 0 .gitlab/ci/env_fedora42_ninja_clang.sh | 1 + .gitlab/ci/env_fedora42_ninja_lfortran.sh | 1 + ...a_multi.sh => env_fedora42_ninja_multi.sh} | 0 .gitlab/ci/env_fedora42_ninja_multi_clang.sh | 1 + ...41_tidy.sh => post_build_fedora42_tidy.sh} | 0 ...a41_tidy.sh => pre_build_fedora42_tidy.sh} | 0 .gitlab/os-linux.yml | 112 +++++++++--------- .gitlab/upload.yml | 4 +- 53 files changed, 124 insertions(+), 123 deletions(-) delete mode 100644 .gitlab/ci/configure_fedora41_makefiles_lfortran.cmake delete mode 100644 .gitlab/ci/configure_fedora41_ninja_lfortran.cmake rename .gitlab/ci/{configure_fedora41_asan.cmake => configure_fedora42_asan.cmake} (72%) rename .gitlab/ci/{configure_fedora41_clang_analyzer.cmake => configure_fedora42_clang_analyzer.cmake} (56%) rename .gitlab/ci/{configure_fedora41_common.cmake => configure_fedora42_common.cmake} (100%) rename .gitlab/ci/{configure_fedora41_common_clang.cmake => configure_fedora42_common_clang.cmake} (100%) rename .gitlab/ci/{configure_fedora41_common_lfortran.cmake => configure_fedora42_common_lfortran.cmake} (100%) rename .gitlab/ci/{configure_fedora41_extdeps.cmake => configure_fedora42_extdeps.cmake} (100%) rename .gitlab/ci/{configure_fedora41_hip_radeon.cmake => configure_fedora42_hip_radeon.cmake} (100%) rename .gitlab/ci/{configure_fedora41_makefiles.cmake => configure_fedora42_makefiles.cmake} (100%) rename .gitlab/ci/{configure_fedora41_makefiles_clang.cmake => configure_fedora42_makefiles_clang.cmake} (68%) create mode 100644 .gitlab/ci/configure_fedora42_makefiles_lfortran.cmake rename .gitlab/ci/{configure_fedora41_makefiles_symlinked.cmake => configure_fedora42_makefiles_symlinked.cmake} (71%) rename .gitlab/ci/{configure_fedora41_ninja.cmake => configure_fedora42_ninja.cmake} (93%) rename .gitlab/ci/{configure_fedora41_ninja_clang.cmake => configure_fedora42_ninja_clang.cmake} (73%) create mode 100644 .gitlab/ci/configure_fedora42_ninja_lfortran.cmake rename .gitlab/ci/{configure_fedora41_ninja_multi.cmake => configure_fedora42_ninja_multi.cmake} (100%) rename .gitlab/ci/{configure_fedora41_ninja_multi_clang.cmake => configure_fedora42_ninja_multi_clang.cmake} (73%) rename .gitlab/ci/{configure_fedora41_sphinx.cmake => configure_fedora42_sphinx.cmake} (100%) rename .gitlab/ci/{configure_fedora41_sphinx_package.cmake => configure_fedora42_sphinx_package.cmake} (100%) rename .gitlab/ci/{configure_fedora41_tidy.cmake => configure_fedora42_tidy.cmake} (85%) rename .gitlab/ci/{ctest_memcheck_fedora41_asan.lsan.supp => ctest_memcheck_fedora42_asan.lsan.supp} (100%) delete mode 100644 .gitlab/ci/env_fedora41_common_clang.sh delete mode 100644 .gitlab/ci/env_fedora41_hip_radeon.sh delete mode 100644 .gitlab/ci/env_fedora41_makefiles_clang.sh delete mode 100644 .gitlab/ci/env_fedora41_makefiles_lfortran.sh delete mode 100644 .gitlab/ci/env_fedora41_makefiles_symlinked.cmake delete mode 100644 .gitlab/ci/env_fedora41_makefiles_symlinked.sh delete mode 100644 .gitlab/ci/env_fedora41_ninja_clang.sh delete mode 100644 .gitlab/ci/env_fedora41_ninja_lfortran.sh delete mode 100644 .gitlab/ci/env_fedora41_ninja_multi_clang.sh rename .gitlab/ci/{env_fedora41_asan.sh => env_fedora42_asan.sh} (100%) rename .gitlab/ci/{env_fedora41_clang_analyzer.sh => env_fedora42_clang_analyzer.sh} (100%) create mode 100644 .gitlab/ci/env_fedora42_common_clang.sh rename .gitlab/ci/{env_fedora41_common_lfortran.sh => env_fedora42_common_lfortran.sh} (100%) rename .gitlab/ci/{env_fedora41_extdeps.sh => env_fedora42_extdeps.sh} (100%) create mode 100644 .gitlab/ci/env_fedora42_hip_radeon.sh rename .gitlab/ci/{env_fedora41_makefiles.cmake => env_fedora42_makefiles.cmake} (100%) rename .gitlab/ci/{env_fedora41_makefiles.sh => env_fedora42_makefiles.sh} (100%) create mode 100644 .gitlab/ci/env_fedora42_makefiles_clang.sh create mode 100644 .gitlab/ci/env_fedora42_makefiles_lfortran.sh create mode 100644 .gitlab/ci/env_fedora42_makefiles_symlinked.cmake create mode 100644 .gitlab/ci/env_fedora42_makefiles_symlinked.sh rename .gitlab/ci/{env_fedora41_ninja.sh => env_fedora42_ninja.sh} (100%) create mode 100644 .gitlab/ci/env_fedora42_ninja_clang.sh create mode 100644 .gitlab/ci/env_fedora42_ninja_lfortran.sh rename .gitlab/ci/{env_fedora41_ninja_multi.sh => env_fedora42_ninja_multi.sh} (100%) create mode 100644 .gitlab/ci/env_fedora42_ninja_multi_clang.sh rename .gitlab/ci/{post_build_fedora41_tidy.sh => post_build_fedora42_tidy.sh} (100%) rename .gitlab/ci/{pre_build_fedora41_tidy.sh => pre_build_fedora42_tidy.sh} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 843167c02a..34f8c9adb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,7 @@ p:source-package: p:doc-package: extends: - - .fedora41_sphinx_package + - .fedora42_sphinx_package - .cmake_prep_doc_linux - .linux_x86_64_tags - .cmake_doc_artifacts @@ -111,18 +111,18 @@ l:iwyu-debian12: - .cmake_cdash_artifacts - .run_automatically -l:tidy-fedora41: +l:tidy-fedora42: extends: - - .fedora41_tidy + - .fedora42_tidy - .cmake_build_linux - .cmake_tidy_artifacts - .linux_x86_64_tags - .cmake_cdash_artifacts - .run_automatically -l:sphinx-fedora41: +l:sphinx-fedora42: extends: - - .fedora41_sphinx + - .fedora42_sphinx - .cmake_build_linux - .cmake_sphinx_artifacts - .linux_x86_64_tags @@ -131,9 +131,9 @@ l:sphinx-fedora41: CMAKE_CI_JOB_CONTINUOUS: "true" CMAKE_CI_JOB_HELP: "true" -l:clang-analyzer-fedora41: +l:clang-analyzer-fedora42: extends: - - .fedora41_clang_analyzer + - .fedora42_clang_analyzer - .cmake_build_linux - .linux_x86_64_tags - .run_automatically @@ -227,9 +227,9 @@ t:debian12-hip-radeon: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora41-hip-radeon: +t:fedora42-hip-radeon: extends: - - .fedora41_hip_radeon + - .fedora42_hip_radeon - .cmake_test_linux_release - .linux_x86_64_tags_rocm6.2 - .run_dependent @@ -237,9 +237,9 @@ t:fedora41-hip-radeon: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora41-makefiles-lfortran: +t:fedora42-makefiles-lfortran: extends: - - .fedora41_makefiles_lfortran + - .fedora42_makefiles_lfortran - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -247,9 +247,9 @@ t:fedora41-makefiles-lfortran: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora41-ninja-lfortran: +t:fedora42-ninja-lfortran: extends: - - .fedora41_ninja_lfortran + - .fedora42_ninja_lfortran - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -257,9 +257,9 @@ t:fedora41-ninja-lfortran: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora41-ninja-clang: +t:fedora42-ninja-clang: extends: - - .fedora41_ninja_clang + - .fedora42_ninja_clang - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -267,9 +267,9 @@ t:fedora41-ninja-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora41-ninja-multi-clang: +t:fedora42-ninja-multi-clang: extends: - - .fedora41_ninja_multi_clang + - .fedora42_ninja_multi_clang - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -277,9 +277,9 @@ t:fedora41-ninja-multi-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora41-makefiles-clang: +t:fedora42-makefiles-clang: extends: - - .fedora41_makefiles_clang + - .fedora42_makefiles_clang - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -287,17 +287,17 @@ t:fedora41-makefiles-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora41-makefiles: +t:fedora42-makefiles: extends: - - .fedora41_makefiles + - .fedora42_makefiles - .cmake_test_linux_release - .linux_x86_64_v3_tags - .run_dependent - .needs_centos7_x86_64 -t:fedora41-makefiles-nospace: +t:fedora42-makefiles-nospace: extends: - - .fedora41_makefiles + - .fedora42_makefiles - .cmake_test_linux_release - .linux_x86_64_v3_tags - .cmake_junit_artifacts @@ -305,7 +305,7 @@ t:fedora41-makefiles-nospace: - .needs_centos7_x86_64 variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci" - CMAKE_CI_BUILD_NAME: fedora41_makefiles_nospace + CMAKE_CI_BUILD_NAME: fedora42_makefiles_nospace CMAKE_CI_JOB_NIGHTLY: "true" t:nvhpc24.9-ninja: @@ -492,9 +492,9 @@ t:debian10-legacy: variables: CMAKE_CI_JOB_NIGHTLY: "true" -b:fedora41-ninja: +b:fedora42-ninja: extends: - - .fedora41_ninja + - .fedora42_ninja - .cmake_build_linux - .cmake_build_artifacts - .linux_x86_64_tags @@ -502,9 +502,9 @@ b:fedora41-ninja: variables: CMAKE_CI_JOB_CONTINUOUS: "true" -b:fedora41-makefiles-symlinked: +b:fedora42-makefiles-symlinked: extends: - - .fedora41_makefiles_symlinked + - .fedora42_makefiles_symlinked - .cmake_build_linux - .cmake_build_artifacts - .linux_x86_64_tags @@ -539,48 +539,48 @@ b:debian12-aarch64-extdeps: variables: CMAKE_CI_JOB_NIGHTLY: "true" -b:fedora41-extdeps: +b:fedora42-extdeps: extends: - - .fedora41_extdeps + - .fedora42_extdeps - .cmake_build_linux_standalone - .linux_x86_64_tags - .run_manually variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora41-ninja: +t:fedora42-ninja: extends: - - .fedora41_ninja + - .fedora42_ninja - .cmake_test_linux - .linux_x86_64_tags_x11 - .cmake_test_artifacts - .run_dependent needs: - - b:fedora41-ninja + - b:fedora42-ninja variables: CMAKE_CI_JOB_CONTINUOUS: "true" -t:fedora41-makefiles-symlinked: +t:fedora42-makefiles-symlinked: extends: - - .fedora41_makefiles_symlinked + - .fedora42_makefiles_symlinked - .cmake_test_linux - .linux_x86_64_tags_x11 - .cmake_test_artifacts - .run_dependent needs: - - b:fedora41-makefiles-symlinked + - b:fedora42-makefiles-symlinked variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora41-ninja-multi: +t:fedora42-ninja-multi: extends: - - .fedora41_ninja_multi + - .fedora42_ninja_multi - .cmake_test_linux_external - .linux_x86_64_tags - .cmake_junit_artifacts - .run_dependent needs: - - t:fedora41-ninja + - t:fedora42-ninja t:intel2016u2-makefiles: extends: @@ -874,9 +874,9 @@ u:sunos-sparc64-package: ## Sanitizer builds -b:fedora41-asan: +b:fedora42-asan: extends: - - .fedora41_asan + - .fedora42_asan - .cmake_build_linux - .cmake_build_artifacts - .linux_x86_64_tags @@ -884,14 +884,14 @@ b:fedora41-asan: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora41-asan: +t:fedora42-asan: extends: - - .fedora41_asan + - .fedora42_asan - .cmake_memcheck_linux - .linux_x86_64_tags - .run_dependent needs: - - b:fedora41-asan + - b:fedora42-asan variables: CMAKE_CI_JOB_NIGHTLY: "true" diff --git a/.gitlab/ci/configure_fedora41_makefiles_lfortran.cmake b/.gitlab/ci/configure_fedora41_makefiles_lfortran.cmake deleted file mode 100644 index 951ce0df09..0000000000 --- a/.gitlab/ci/configure_fedora41_makefiles_lfortran.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_lfortran.cmake") diff --git a/.gitlab/ci/configure_fedora41_ninja_lfortran.cmake b/.gitlab/ci/configure_fedora41_ninja_lfortran.cmake deleted file mode 100644 index 951ce0df09..0000000000 --- a/.gitlab/ci/configure_fedora41_ninja_lfortran.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_lfortran.cmake") diff --git a/.gitlab/ci/configure_fedora41_asan.cmake b/.gitlab/ci/configure_fedora42_asan.cmake similarity index 72% rename from .gitlab/ci/configure_fedora41_asan.cmake rename to .gitlab/ci/configure_fedora42_asan.cmake index 4441792ea6..60a3cb1c2d 100644 --- a/.gitlab/ci/configure_fedora41_asan.cmake +++ b/.gitlab/ci/configure_fedora42_asan.cmake @@ -2,4 +2,4 @@ set(CMAKE_C_FLAGS "-fsanitize=address" CACHE STRING "") set(CMAKE_CXX_FLAGS "-fsanitize=address" CACHE STRING "") set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "") -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake") diff --git a/.gitlab/ci/configure_fedora41_clang_analyzer.cmake b/.gitlab/ci/configure_fedora42_clang_analyzer.cmake similarity index 56% rename from .gitlab/ci/configure_fedora41_clang_analyzer.cmake rename to .gitlab/ci/configure_fedora42_clang_analyzer.cmake index 4a518d0f3b..c484570b4c 100644 --- a/.gitlab/ci/configure_fedora41_clang_analyzer.cmake +++ b/.gitlab/ci/configure_fedora42_clang_analyzer.cmake @@ -1,4 +1,4 @@ set(configure_no_sccache 1) set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "") -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake") diff --git a/.gitlab/ci/configure_fedora41_common.cmake b/.gitlab/ci/configure_fedora42_common.cmake similarity index 100% rename from .gitlab/ci/configure_fedora41_common.cmake rename to .gitlab/ci/configure_fedora42_common.cmake diff --git a/.gitlab/ci/configure_fedora41_common_clang.cmake b/.gitlab/ci/configure_fedora42_common_clang.cmake similarity index 100% rename from .gitlab/ci/configure_fedora41_common_clang.cmake rename to .gitlab/ci/configure_fedora42_common_clang.cmake diff --git a/.gitlab/ci/configure_fedora41_common_lfortran.cmake b/.gitlab/ci/configure_fedora42_common_lfortran.cmake similarity index 100% rename from .gitlab/ci/configure_fedora41_common_lfortran.cmake rename to .gitlab/ci/configure_fedora42_common_lfortran.cmake diff --git a/.gitlab/ci/configure_fedora41_extdeps.cmake b/.gitlab/ci/configure_fedora42_extdeps.cmake similarity index 100% rename from .gitlab/ci/configure_fedora41_extdeps.cmake rename to .gitlab/ci/configure_fedora42_extdeps.cmake diff --git a/.gitlab/ci/configure_fedora41_hip_radeon.cmake b/.gitlab/ci/configure_fedora42_hip_radeon.cmake similarity index 100% rename from .gitlab/ci/configure_fedora41_hip_radeon.cmake rename to .gitlab/ci/configure_fedora42_hip_radeon.cmake diff --git a/.gitlab/ci/configure_fedora41_makefiles.cmake b/.gitlab/ci/configure_fedora42_makefiles.cmake similarity index 100% rename from .gitlab/ci/configure_fedora41_makefiles.cmake rename to .gitlab/ci/configure_fedora42_makefiles.cmake diff --git a/.gitlab/ci/configure_fedora41_makefiles_clang.cmake b/.gitlab/ci/configure_fedora42_makefiles_clang.cmake similarity index 68% rename from .gitlab/ci/configure_fedora41_makefiles_clang.cmake rename to .gitlab/ci/configure_fedora42_makefiles_clang.cmake index 3d6614e5f5..36588a52dd 100644 --- a/.gitlab/ci/configure_fedora41_makefiles_clang.cmake +++ b/.gitlab/ci/configure_fedora42_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_fedora41_common_clang.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora42_makefiles_lfortran.cmake b/.gitlab/ci/configure_fedora42_makefiles_lfortran.cmake new file mode 100644 index 0000000000..ae32c04ed3 --- /dev/null +++ b/.gitlab/ci/configure_fedora42_makefiles_lfortran.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_lfortran.cmake") diff --git a/.gitlab/ci/configure_fedora41_makefiles_symlinked.cmake b/.gitlab/ci/configure_fedora42_makefiles_symlinked.cmake similarity index 71% rename from .gitlab/ci/configure_fedora41_makefiles_symlinked.cmake rename to .gitlab/ci/configure_fedora42_makefiles_symlinked.cmake index 317de3a227..e498a4819c 100644 --- a/.gitlab/ci/configure_fedora41_makefiles_symlinked.cmake +++ b/.gitlab/ci/configure_fedora42_makefiles_symlinked.cmake @@ -2,4 +2,4 @@ set(CMake_QT_MAJOR_VERSION "6" CACHE STRING "") set(CMake_TEST_GUI "ON" CACHE BOOL "") include("${CMAKE_CURRENT_LIST_DIR}/configure_symlinked_common.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake") diff --git a/.gitlab/ci/configure_fedora41_ninja.cmake b/.gitlab/ci/configure_fedora42_ninja.cmake similarity index 93% rename from .gitlab/ci/configure_fedora41_ninja.cmake rename to .gitlab/ci/configure_fedora42_ninja.cmake index 9bef7e802f..07ce93b339 100644 --- a/.gitlab/ci/configure_fedora41_ninja.cmake +++ b/.gitlab/ci/configure_fedora42_ninja.cmake @@ -17,4 +17,4 @@ set(CMAKE_CXX_STANDARD "11" CACHE STRING "") # Qt 6 requires C++17, so use Qt 5. set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "") -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake") diff --git a/.gitlab/ci/configure_fedora41_ninja_clang.cmake b/.gitlab/ci/configure_fedora42_ninja_clang.cmake similarity index 73% rename from .gitlab/ci/configure_fedora41_ninja_clang.cmake rename to .gitlab/ci/configure_fedora42_ninja_clang.cmake index a6e7e2aa00..a1c7fc0d56 100644 --- a/.gitlab/ci/configure_fedora41_ninja_clang.cmake +++ b/.gitlab/ci/configure_fedora42_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_fedora41_common_clang.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora42_ninja_lfortran.cmake b/.gitlab/ci/configure_fedora42_ninja_lfortran.cmake new file mode 100644 index 0000000000..ae32c04ed3 --- /dev/null +++ b/.gitlab/ci/configure_fedora42_ninja_lfortran.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_lfortran.cmake") diff --git a/.gitlab/ci/configure_fedora41_ninja_multi.cmake b/.gitlab/ci/configure_fedora42_ninja_multi.cmake similarity index 100% rename from .gitlab/ci/configure_fedora41_ninja_multi.cmake rename to .gitlab/ci/configure_fedora42_ninja_multi.cmake diff --git a/.gitlab/ci/configure_fedora41_ninja_multi_clang.cmake b/.gitlab/ci/configure_fedora42_ninja_multi_clang.cmake similarity index 73% rename from .gitlab/ci/configure_fedora41_ninja_multi_clang.cmake rename to .gitlab/ci/configure_fedora42_ninja_multi_clang.cmake index a6e7e2aa00..a1c7fc0d56 100644 --- a/.gitlab/ci/configure_fedora41_ninja_multi_clang.cmake +++ b/.gitlab/ci/configure_fedora42_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_fedora41_common_clang.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora41_sphinx.cmake b/.gitlab/ci/configure_fedora42_sphinx.cmake similarity index 100% rename from .gitlab/ci/configure_fedora41_sphinx.cmake rename to .gitlab/ci/configure_fedora42_sphinx.cmake diff --git a/.gitlab/ci/configure_fedora41_sphinx_package.cmake b/.gitlab/ci/configure_fedora42_sphinx_package.cmake similarity index 100% rename from .gitlab/ci/configure_fedora41_sphinx_package.cmake rename to .gitlab/ci/configure_fedora42_sphinx_package.cmake diff --git a/.gitlab/ci/configure_fedora41_tidy.cmake b/.gitlab/ci/configure_fedora42_tidy.cmake similarity index 85% rename from .gitlab/ci/configure_fedora41_tidy.cmake rename to .gitlab/ci/configure_fedora42_tidy.cmake index 664b4f1e77..f5dbe06d74 100644 --- a/.gitlab/ci/configure_fedora41_tidy.cmake +++ b/.gitlab/ci/configure_fedora42_tidy.cmake @@ -4,4 +4,4 @@ set(CMake_CLANG_TIDY_MODULE "$ENV{CI_PROJECT_DIR}/Utilities/ClangTidyModule/buil set(CMake_CLANG_TIDY_EXPORT_FIXES_DIR "$ENV{CI_PROJECT_DIR}/.gitlab/clang-tidy-fixes" CACHE PATH "") set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "") -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake") diff --git a/.gitlab/ci/ctest_memcheck_fedora41_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora42_asan.lsan.supp similarity index 100% rename from .gitlab/ci/ctest_memcheck_fedora41_asan.lsan.supp rename to .gitlab/ci/ctest_memcheck_fedora42_asan.lsan.supp diff --git a/.gitlab/ci/env_fedora41_common_clang.sh b/.gitlab/ci/env_fedora41_common_clang.sh deleted file mode 100644 index 02c8ca6aab..0000000000 --- a/.gitlab/ci/env_fedora41_common_clang.sh +++ /dev/null @@ -1,3 +0,0 @@ -export CC=/usr/bin/clang-19 -export CXX=/usr/bin/clang++-19 -export FC=/usr/bin/flang-new diff --git a/.gitlab/ci/env_fedora41_hip_radeon.sh b/.gitlab/ci/env_fedora41_hip_radeon.sh deleted file mode 100644 index 8024f56a30..0000000000 --- a/.gitlab/ci/env_fedora41_hip_radeon.sh +++ /dev/null @@ -1 +0,0 @@ -export HIPCXX=/usr/bin/clang++-18 diff --git a/.gitlab/ci/env_fedora41_makefiles_clang.sh b/.gitlab/ci/env_fedora41_makefiles_clang.sh deleted file mode 100644 index e2892e5873..0000000000 --- a/.gitlab/ci/env_fedora41_makefiles_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora41_common_clang.sh diff --git a/.gitlab/ci/env_fedora41_makefiles_lfortran.sh b/.gitlab/ci/env_fedora41_makefiles_lfortran.sh deleted file mode 100644 index 10e5623725..0000000000 --- a/.gitlab/ci/env_fedora41_makefiles_lfortran.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora41_common_lfortran.sh diff --git a/.gitlab/ci/env_fedora41_makefiles_symlinked.cmake b/.gitlab/ci/env_fedora41_makefiles_symlinked.cmake deleted file mode 100644 index 16937df0c1..0000000000 --- a/.gitlab/ci/env_fedora41_makefiles_symlinked.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/env_fedora41_makefiles.cmake") diff --git a/.gitlab/ci/env_fedora41_makefiles_symlinked.sh b/.gitlab/ci/env_fedora41_makefiles_symlinked.sh deleted file mode 100644 index 7f84e9fdb2..0000000000 --- a/.gitlab/ci/env_fedora41_makefiles_symlinked.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora41_makefiles.sh diff --git a/.gitlab/ci/env_fedora41_ninja_clang.sh b/.gitlab/ci/env_fedora41_ninja_clang.sh deleted file mode 100644 index e2892e5873..0000000000 --- a/.gitlab/ci/env_fedora41_ninja_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora41_common_clang.sh diff --git a/.gitlab/ci/env_fedora41_ninja_lfortran.sh b/.gitlab/ci/env_fedora41_ninja_lfortran.sh deleted file mode 100644 index 10e5623725..0000000000 --- a/.gitlab/ci/env_fedora41_ninja_lfortran.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora41_common_lfortran.sh diff --git a/.gitlab/ci/env_fedora41_ninja_multi_clang.sh b/.gitlab/ci/env_fedora41_ninja_multi_clang.sh deleted file mode 100644 index e2892e5873..0000000000 --- a/.gitlab/ci/env_fedora41_ninja_multi_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora41_common_clang.sh diff --git a/.gitlab/ci/env_fedora41_asan.sh b/.gitlab/ci/env_fedora42_asan.sh similarity index 100% rename from .gitlab/ci/env_fedora41_asan.sh rename to .gitlab/ci/env_fedora42_asan.sh diff --git a/.gitlab/ci/env_fedora41_clang_analyzer.sh b/.gitlab/ci/env_fedora42_clang_analyzer.sh similarity index 100% rename from .gitlab/ci/env_fedora41_clang_analyzer.sh rename to .gitlab/ci/env_fedora42_clang_analyzer.sh diff --git a/.gitlab/ci/env_fedora42_common_clang.sh b/.gitlab/ci/env_fedora42_common_clang.sh new file mode 100644 index 0000000000..43775d285d --- /dev/null +++ b/.gitlab/ci/env_fedora42_common_clang.sh @@ -0,0 +1,3 @@ +export CC=/usr/bin/clang-20 +export CXX=/usr/bin/clang++-20 +export FC=/usr/bin/flang-20 diff --git a/.gitlab/ci/env_fedora41_common_lfortran.sh b/.gitlab/ci/env_fedora42_common_lfortran.sh similarity index 100% rename from .gitlab/ci/env_fedora41_common_lfortran.sh rename to .gitlab/ci/env_fedora42_common_lfortran.sh diff --git a/.gitlab/ci/env_fedora41_extdeps.sh b/.gitlab/ci/env_fedora42_extdeps.sh similarity index 100% rename from .gitlab/ci/env_fedora41_extdeps.sh rename to .gitlab/ci/env_fedora42_extdeps.sh diff --git a/.gitlab/ci/env_fedora42_hip_radeon.sh b/.gitlab/ci/env_fedora42_hip_radeon.sh new file mode 100644 index 0000000000..cc57cc71ac --- /dev/null +++ b/.gitlab/ci/env_fedora42_hip_radeon.sh @@ -0,0 +1,2 @@ +export HIPCXX=/usr/bin/clang++-20 +export HIPFLAGS='--rocm-path=/usr --rocm-device-lib-path=/usr/lib64/rocm/llvm/lib/clang/18/amdgcn/bitcode' diff --git a/.gitlab/ci/env_fedora41_makefiles.cmake b/.gitlab/ci/env_fedora42_makefiles.cmake similarity index 100% rename from .gitlab/ci/env_fedora41_makefiles.cmake rename to .gitlab/ci/env_fedora42_makefiles.cmake diff --git a/.gitlab/ci/env_fedora41_makefiles.sh b/.gitlab/ci/env_fedora42_makefiles.sh similarity index 100% rename from .gitlab/ci/env_fedora41_makefiles.sh rename to .gitlab/ci/env_fedora42_makefiles.sh diff --git a/.gitlab/ci/env_fedora42_makefiles_clang.sh b/.gitlab/ci/env_fedora42_makefiles_clang.sh new file mode 100644 index 0000000000..8067256931 --- /dev/null +++ b/.gitlab/ci/env_fedora42_makefiles_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora42_common_clang.sh diff --git a/.gitlab/ci/env_fedora42_makefiles_lfortran.sh b/.gitlab/ci/env_fedora42_makefiles_lfortran.sh new file mode 100644 index 0000000000..9d559f9020 --- /dev/null +++ b/.gitlab/ci/env_fedora42_makefiles_lfortran.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora42_common_lfortran.sh diff --git a/.gitlab/ci/env_fedora42_makefiles_symlinked.cmake b/.gitlab/ci/env_fedora42_makefiles_symlinked.cmake new file mode 100644 index 0000000000..fcf100a7d0 --- /dev/null +++ b/.gitlab/ci/env_fedora42_makefiles_symlinked.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/env_fedora42_makefiles.cmake") diff --git a/.gitlab/ci/env_fedora42_makefiles_symlinked.sh b/.gitlab/ci/env_fedora42_makefiles_symlinked.sh new file mode 100644 index 0000000000..c18e12505a --- /dev/null +++ b/.gitlab/ci/env_fedora42_makefiles_symlinked.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora42_makefiles.sh diff --git a/.gitlab/ci/env_fedora41_ninja.sh b/.gitlab/ci/env_fedora42_ninja.sh similarity index 100% rename from .gitlab/ci/env_fedora41_ninja.sh rename to .gitlab/ci/env_fedora42_ninja.sh diff --git a/.gitlab/ci/env_fedora42_ninja_clang.sh b/.gitlab/ci/env_fedora42_ninja_clang.sh new file mode 100644 index 0000000000..8067256931 --- /dev/null +++ b/.gitlab/ci/env_fedora42_ninja_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora42_common_clang.sh diff --git a/.gitlab/ci/env_fedora42_ninja_lfortran.sh b/.gitlab/ci/env_fedora42_ninja_lfortran.sh new file mode 100644 index 0000000000..9d559f9020 --- /dev/null +++ b/.gitlab/ci/env_fedora42_ninja_lfortran.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora42_common_lfortran.sh diff --git a/.gitlab/ci/env_fedora41_ninja_multi.sh b/.gitlab/ci/env_fedora42_ninja_multi.sh similarity index 100% rename from .gitlab/ci/env_fedora41_ninja_multi.sh rename to .gitlab/ci/env_fedora42_ninja_multi.sh diff --git a/.gitlab/ci/env_fedora42_ninja_multi_clang.sh b/.gitlab/ci/env_fedora42_ninja_multi_clang.sh new file mode 100644 index 0000000000..8067256931 --- /dev/null +++ b/.gitlab/ci/env_fedora42_ninja_multi_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora42_common_clang.sh diff --git a/.gitlab/ci/post_build_fedora41_tidy.sh b/.gitlab/ci/post_build_fedora42_tidy.sh similarity index 100% rename from .gitlab/ci/post_build_fedora41_tidy.sh rename to .gitlab/ci/post_build_fedora42_tidy.sh diff --git a/.gitlab/ci/pre_build_fedora41_tidy.sh b/.gitlab/ci/pre_build_fedora42_tidy.sh similarity index 100% rename from .gitlab/ci/pre_build_fedora41_tidy.sh rename to .gitlab/ci/pre_build_fedora42_tidy.sh diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index c0e22926b3..9f08416355 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -5,7 +5,7 @@ ### Release .linux_prep_source: - image: "fedora:41" + image: "fedora:42" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -82,15 +82,15 @@ ### Fedora -.fedora41: - image: "kitware/cmake:ci-fedora41-x86_64-2025-03-31" +.fedora42: + image: "kitware/cmake:ci-fedora42-x86_64-2025-04-22" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" CMAKE_ARCH: x86_64 -.fedora41_hip: - image: "kitware/cmake:ci-fedora41-hip-x86_64-2025-02-03" +.fedora42_hip: + image: "kitware/cmake:ci-fedora42-hip-x86_64-2025-04-22" variables: # FIXME(rocclr): device modules fail loading from binaries in paths with spaces @@ -99,36 +99,36 @@ #### Lint builds -.fedora41_tidy: - extends: .fedora41 +.fedora42_tidy: + extends: .fedora42 variables: - CMAKE_CONFIGURATION: fedora41_tidy + CMAKE_CONFIGURATION: fedora42_tidy CMAKE_CI_NO_INSTALL: 1 -.fedora41_clang_analyzer: - extends: .fedora41 +.fedora42_clang_analyzer: + extends: .fedora42 variables: - CMAKE_CONFIGURATION: fedora41_clang_analyzer + CMAKE_CONFIGURATION: fedora42_clang_analyzer CMAKE_CI_BUILD_TYPE: Debug CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_CI_NO_INSTALL: 1 -.fedora41_sphinx: - extends: .fedora41 +.fedora42_sphinx: + extends: .fedora42 variables: - CMAKE_CONFIGURATION: fedora41_sphinx + CMAKE_CONFIGURATION: fedora42_sphinx CTEST_NO_WARNINGS_ALLOWED: 1 CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" CMAKE_CI_NO_INSTALL: 1 -.fedora41_sphinx_package: - extends: .fedora41 +.fedora42_sphinx_package: + extends: .fedora42 variables: - CMAKE_CONFIGURATION: fedora41_sphinx_package + CMAKE_CONFIGURATION: fedora42_sphinx_package CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" #### Build and test @@ -184,43 +184,43 @@ CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora41_extdeps: - extends: .fedora41 +.fedora42_extdeps: + extends: .fedora42 variables: - CMAKE_CONFIGURATION: fedora41_extdeps + CMAKE_CONFIGURATION: fedora42_extdeps CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora41_ninja: - extends: .fedora41 +.fedora42_ninja: + extends: .fedora42 variables: - CMAKE_CONFIGURATION: fedora41_ninja + CMAKE_CONFIGURATION: fedora42_ninja CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora41_ninja_multi: - extends: .fedora41 +.fedora42_ninja_multi: + extends: .fedora42 variables: - CMAKE_CONFIGURATION: fedora41_ninja_multi + CMAKE_CONFIGURATION: fedora42_ninja_multi CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Ninja Multi-Config" -.fedora41_makefiles: - extends: .fedora41 +.fedora42_makefiles: + extends: .fedora42 variables: - CMAKE_CONFIGURATION: fedora41_makefiles + CMAKE_CONFIGURATION: fedora42_makefiles CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" -.fedora41_makefiles_symlinked: - extends: .fedora41 +.fedora42_makefiles_symlinked: + extends: .fedora42 variables: - CMAKE_CONFIGURATION: fedora41_makefiles_symlinked + CMAKE_CONFIGURATION: fedora42_makefiles_symlinked CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" CMAKE_CI_IN_SYMLINK_TREE: 1 @@ -241,43 +241,43 @@ variables: CMAKE_CONFIGURATION: debian12_ninja_clang -.fedora41_makefiles_clang: - extends: .fedora41 +.fedora42_makefiles_clang: + extends: .fedora42 variables: - CMAKE_CONFIGURATION: fedora41_makefiles_clang + CMAKE_CONFIGURATION: fedora42_makefiles_clang CMAKE_GENERATOR: "Unix Makefiles" -.fedora41_makefiles_lfortran: - extends: .fedora41 +.fedora42_makefiles_lfortran: + extends: .fedora42 variables: # FIXME(lfortran): -rpath flags with spaces not forwarded GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci" - CMAKE_CONFIGURATION: fedora41_makefiles_lfortran + CMAKE_CONFIGURATION: fedora42_makefiles_lfortran CMAKE_GENERATOR: "Unix Makefiles" CTEST_LABELS: "Fortran" -.fedora41_ninja_lfortran: - extends: .fedora41 +.fedora42_ninja_lfortran: + extends: .fedora42 variables: # FIXME(lfortran): -rpath flags with spaces not forwarded GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci" - CMAKE_CONFIGURATION: fedora41_ninja_lfortran + CMAKE_CONFIGURATION: fedora42_ninja_lfortran CTEST_LABELS: "Fortran" -.fedora41_ninja_clang: - extends: .fedora41 +.fedora42_ninja_clang: + extends: .fedora42 variables: - CMAKE_CONFIGURATION: fedora41_ninja_clang + CMAKE_CONFIGURATION: fedora42_ninja_clang -.fedora41_ninja_multi_clang: - extends: .fedora41 +.fedora42_ninja_multi_clang: + extends: .fedora42 variables: - CMAKE_CONFIGURATION: fedora41_ninja_multi_clang + CMAKE_CONFIGURATION: fedora42_ninja_multi_clang CMAKE_GENERATOR: "Ninja Multi-Config" ### Sanitizers @@ -293,13 +293,13 @@ CTEST_MEMORYCHECK_TYPE: AddressSanitizer CTEST_MEMORYCHECK_SANITIZER_OPTIONS: "" -.fedora41_asan: +.fedora42_asan: extends: - - .fedora41 + - .fedora42 - .fedora_asan_addon variables: - CMAKE_CONFIGURATION: fedora41_asan + CMAKE_CONFIGURATION: fedora42_asan ### Intel Compiler @@ -476,11 +476,11 @@ CMAKE_CONFIGURATION: debian12_hip_radeon CTEST_LABELS: "HIP" -.fedora41_hip_radeon: - extends: .fedora41_hip +.fedora42_hip_radeon: + extends: .fedora42_hip variables: - CMAKE_CONFIGURATION: fedora41_hip_radeon + CMAKE_CONFIGURATION: fedora42_hip_radeon CTEST_LABELS: "HIP" .hip6.3_nvidia: @@ -637,14 +637,14 @@ .cmake_version_update_linux: stage: build - extends: .fedora41 + extends: .fedora42 script: - .gitlab/ci/cmake_version_update.sh interruptible: false # The job internally fetches and retries. .cmake_spellcheck_linux: stage: build - extends: .fedora41 + extends: .fedora42 script: - .gitlab/ci/codespell.bash - .gitlab/ci/typos.bash @@ -815,7 +815,7 @@ .cmake_org_help: stage: build extends: - - .fedora41 + - .fedora42 - .linux_x86_64_tags - .cmake_org_help_artifacts script: diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml index ac177a99c1..c489c5448b 100644 --- a/.gitlab/upload.yml +++ b/.gitlab/upload.yml @@ -1,7 +1,7 @@ # Steps for uploading artifacts .rsync_upload_package: - image: "fedora:41" + image: "fedora:42" stage: upload tags: - cmake @@ -21,7 +21,7 @@ .rsync_upload_help: stage: upload - image: "fedora:41" + image: "fedora:42" tags: - cmake - docker