From 99238b23e9683a96edc75ab2a2ec223b35aa2b4e Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Nov 2023 09:34:02 -0500 Subject: [PATCH] ci: use Fedora 39 images and environments --- .gitlab-ci.yml | 88 ++++++++--------- .../configure_fedora38_clang_analyzer.cmake | 3 - ...an.cmake => configure_fedora39_asan.cmake} | 2 +- .../configure_fedora39_clang_analyzer.cmake | 3 + ....cmake => configure_fedora39_common.cmake} | 0 ... => configure_fedora39_common_clang.cmake} | 1 - ...cmake => configure_fedora39_extdeps.cmake} | 0 ...ke => configure_fedora39_hip_radeon.cmake} | 0 ...ake => configure_fedora39_makefiles.cmake} | 0 ... configure_fedora39_makefiles_clang.cmake} | 2 +- ...figure_fedora39_makefiles_symlinked.cmake} | 2 +- ...a.cmake => configure_fedora39_ninja.cmake} | 2 +- ...e => configure_fedora39_ninja_clang.cmake} | 2 +- ...e => configure_fedora39_ninja_multi.cmake} | 0 ...onfigure_fedora39_ninja_multi_clang.cmake} | 2 +- ....cmake => configure_fedora39_sphinx.cmake} | 0 ...> configure_fedora39_sphinx_package.cmake} | 0 ...dy.cmake => configure_fedora39_tidy.cmake} | 2 +- ...=> ctest_memcheck_fedora39_asan.lsan.supp} | 0 .gitlab/ci/env_fedora38_common_clang.sh | 4 - .gitlab/ci/env_fedora38_hip_radeon.sh | 1 - .gitlab/ci/env_fedora38_makefiles_clang.sh | 1 - .../ci/env_fedora38_makefiles_symlinked.cmake | 1 - .../ci/env_fedora38_makefiles_symlinked.sh | 1 - .gitlab/ci/env_fedora38_ninja_clang.sh | 1 - .gitlab/ci/env_fedora38_ninja_multi_clang.sh | 1 - ..._fedora38_asan.sh => env_fedora39_asan.sh} | 0 ...yzer.sh => env_fedora39_clang_analyzer.sh} | 0 .gitlab/ci/env_fedora39_common_clang.sh | 3 + ...a38_extdeps.sh => env_fedora39_extdeps.sh} | 0 .gitlab/ci/env_fedora39_hip_radeon.sh | 1 + ...les.cmake => env_fedora39_makefiles.cmake} | 0 ...makefiles.sh => env_fedora39_makefiles.sh} | 0 .gitlab/ci/env_fedora39_makefiles_clang.sh | 1 + .../ci/env_fedora39_makefiles_symlinked.cmake | 1 + .../ci/env_fedora39_makefiles_symlinked.sh | 1 + ...edora38_ninja.sh => env_fedora39_ninja.sh} | 0 .gitlab/ci/env_fedora39_ninja_clang.sh | 1 + ...a_multi.sh => env_fedora39_ninja_multi.sh} | 0 .gitlab/ci/env_fedora39_ninja_multi_clang.sh | 1 + ...a38_tidy.sh => pre_build_fedora39_tidy.sh} | 0 .gitlab/os-linux.yml | 94 +++++++++---------- .gitlab/upload.yml | 4 +- 43 files changed, 112 insertions(+), 114 deletions(-) delete mode 100644 .gitlab/ci/configure_fedora38_clang_analyzer.cmake rename .gitlab/ci/{configure_fedora38_asan.cmake => configure_fedora39_asan.cmake} (65%) create mode 100644 .gitlab/ci/configure_fedora39_clang_analyzer.cmake rename .gitlab/ci/{configure_fedora38_common.cmake => configure_fedora39_common.cmake} (100%) rename .gitlab/ci/{configure_fedora38_common_clang.cmake => configure_fedora39_common_clang.cmake} (78%) rename .gitlab/ci/{configure_fedora38_extdeps.cmake => configure_fedora39_extdeps.cmake} (100%) rename .gitlab/ci/{configure_fedora38_hip_radeon.cmake => configure_fedora39_hip_radeon.cmake} (100%) rename .gitlab/ci/{configure_fedora38_makefiles.cmake => configure_fedora39_makefiles.cmake} (100%) rename .gitlab/ci/{configure_fedora38_makefiles_clang.cmake => configure_fedora39_makefiles_clang.cmake} (68%) rename .gitlab/ci/{configure_fedora38_makefiles_symlinked.cmake => configure_fedora39_makefiles_symlinked.cmake} (53%) rename .gitlab/ci/{configure_fedora38_ninja.cmake => configure_fedora39_ninja.cmake} (88%) rename .gitlab/ci/{configure_fedora38_ninja_multi_clang.cmake => configure_fedora39_ninja_clang.cmake} (81%) rename .gitlab/ci/{configure_fedora38_ninja_multi.cmake => configure_fedora39_ninja_multi.cmake} (100%) rename .gitlab/ci/{configure_fedora38_ninja_clang.cmake => configure_fedora39_ninja_multi_clang.cmake} (81%) rename .gitlab/ci/{configure_fedora38_sphinx.cmake => configure_fedora39_sphinx.cmake} (100%) rename .gitlab/ci/{configure_fedora38_sphinx_package.cmake => configure_fedora39_sphinx_package.cmake} (100%) rename .gitlab/ci/{configure_fedora38_tidy.cmake => configure_fedora39_tidy.cmake} (78%) rename .gitlab/ci/{ctest_memcheck_fedora38_asan.lsan.supp => ctest_memcheck_fedora39_asan.lsan.supp} (100%) delete mode 100644 .gitlab/ci/env_fedora38_common_clang.sh delete mode 100644 .gitlab/ci/env_fedora38_hip_radeon.sh delete mode 100644 .gitlab/ci/env_fedora38_makefiles_clang.sh delete mode 100644 .gitlab/ci/env_fedora38_makefiles_symlinked.cmake delete mode 100644 .gitlab/ci/env_fedora38_makefiles_symlinked.sh delete mode 100644 .gitlab/ci/env_fedora38_ninja_clang.sh delete mode 100644 .gitlab/ci/env_fedora38_ninja_multi_clang.sh rename .gitlab/ci/{env_fedora38_asan.sh => env_fedora39_asan.sh} (100%) rename .gitlab/ci/{env_fedora38_clang_analyzer.sh => env_fedora39_clang_analyzer.sh} (100%) create mode 100644 .gitlab/ci/env_fedora39_common_clang.sh rename .gitlab/ci/{env_fedora38_extdeps.sh => env_fedora39_extdeps.sh} (100%) create mode 100644 .gitlab/ci/env_fedora39_hip_radeon.sh rename .gitlab/ci/{env_fedora38_makefiles.cmake => env_fedora39_makefiles.cmake} (100%) rename .gitlab/ci/{env_fedora38_makefiles.sh => env_fedora39_makefiles.sh} (100%) create mode 100644 .gitlab/ci/env_fedora39_makefiles_clang.sh create mode 100644 .gitlab/ci/env_fedora39_makefiles_symlinked.cmake create mode 100644 .gitlab/ci/env_fedora39_makefiles_symlinked.sh rename .gitlab/ci/{env_fedora38_ninja.sh => env_fedora39_ninja.sh} (100%) create mode 100644 .gitlab/ci/env_fedora39_ninja_clang.sh rename .gitlab/ci/{env_fedora38_ninja_multi.sh => env_fedora39_ninja_multi.sh} (100%) create mode 100644 .gitlab/ci/env_fedora39_ninja_multi_clang.sh rename .gitlab/ci/{pre_build_fedora38_tidy.sh => pre_build_fedora39_tidy.sh} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 032a6fc4d3..b8bb4ab8df 100644 --- a/.gitlab-ci.yml +++ b/.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" diff --git a/.gitlab/ci/configure_fedora38_clang_analyzer.cmake b/.gitlab/ci/configure_fedora38_clang_analyzer.cmake deleted file mode 100644 index c11eef14d4..0000000000 --- a/.gitlab/ci/configure_fedora38_clang_analyzer.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(configure_no_sccache 1) - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake") diff --git a/.gitlab/ci/configure_fedora38_asan.cmake b/.gitlab/ci/configure_fedora39_asan.cmake similarity index 65% rename from .gitlab/ci/configure_fedora38_asan.cmake rename to .gitlab/ci/configure_fedora39_asan.cmake index 8eae500363..872517c197 100644 --- a/.gitlab/ci/configure_fedora38_asan.cmake +++ b/.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") diff --git a/.gitlab/ci/configure_fedora39_clang_analyzer.cmake b/.gitlab/ci/configure_fedora39_clang_analyzer.cmake new file mode 100644 index 0000000000..1bfb3fb718 --- /dev/null +++ b/.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") diff --git a/.gitlab/ci/configure_fedora38_common.cmake b/.gitlab/ci/configure_fedora39_common.cmake similarity index 100% rename from .gitlab/ci/configure_fedora38_common.cmake rename to .gitlab/ci/configure_fedora39_common.cmake diff --git a/.gitlab/ci/configure_fedora38_common_clang.cmake b/.gitlab/ci/configure_fedora39_common_clang.cmake similarity index 78% rename from .gitlab/ci/configure_fedora38_common_clang.cmake rename to .gitlab/ci/configure_fedora39_common_clang.cmake index 70c9df9dcf..1b3835affd 100644 --- a/.gitlab/ci/configure_fedora38_common_clang.cmake +++ b/.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") diff --git a/.gitlab/ci/configure_fedora38_extdeps.cmake b/.gitlab/ci/configure_fedora39_extdeps.cmake similarity index 100% rename from .gitlab/ci/configure_fedora38_extdeps.cmake rename to .gitlab/ci/configure_fedora39_extdeps.cmake diff --git a/.gitlab/ci/configure_fedora38_hip_radeon.cmake b/.gitlab/ci/configure_fedora39_hip_radeon.cmake similarity index 100% rename from .gitlab/ci/configure_fedora38_hip_radeon.cmake rename to .gitlab/ci/configure_fedora39_hip_radeon.cmake diff --git a/.gitlab/ci/configure_fedora38_makefiles.cmake b/.gitlab/ci/configure_fedora39_makefiles.cmake similarity index 100% rename from .gitlab/ci/configure_fedora38_makefiles.cmake rename to .gitlab/ci/configure_fedora39_makefiles.cmake diff --git a/.gitlab/ci/configure_fedora38_makefiles_clang.cmake b/.gitlab/ci/configure_fedora39_makefiles_clang.cmake similarity index 68% rename from .gitlab/ci/configure_fedora38_makefiles_clang.cmake rename to .gitlab/ci/configure_fedora39_makefiles_clang.cmake index 3ac23bebb9..a85ae70cdc 100644 --- a/.gitlab/ci/configure_fedora38_makefiles_clang.cmake +++ b/.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") diff --git a/.gitlab/ci/configure_fedora38_makefiles_symlinked.cmake b/.gitlab/ci/configure_fedora39_makefiles_symlinked.cmake similarity index 53% rename from .gitlab/ci/configure_fedora38_makefiles_symlinked.cmake rename to .gitlab/ci/configure_fedora39_makefiles_symlinked.cmake index 177bbcf59d..b53ab6651e 100644 --- a/.gitlab/ci/configure_fedora38_makefiles_symlinked.cmake +++ b/.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") diff --git a/.gitlab/ci/configure_fedora38_ninja.cmake b/.gitlab/ci/configure_fedora39_ninja.cmake similarity index 88% rename from .gitlab/ci/configure_fedora38_ninja.cmake rename to .gitlab/ci/configure_fedora39_ninja.cmake index ac6b9f692b..ff233a388e 100644 --- a/.gitlab/ci/configure_fedora38_ninja.cmake +++ b/.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") diff --git a/.gitlab/ci/configure_fedora38_ninja_multi_clang.cmake b/.gitlab/ci/configure_fedora39_ninja_clang.cmake similarity index 81% rename from .gitlab/ci/configure_fedora38_ninja_multi_clang.cmake rename to .gitlab/ci/configure_fedora39_ninja_clang.cmake index 848c5b6739..49552d6bd8 100644 --- a/.gitlab/ci/configure_fedora38_ninja_multi_clang.cmake +++ b/.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") diff --git a/.gitlab/ci/configure_fedora38_ninja_multi.cmake b/.gitlab/ci/configure_fedora39_ninja_multi.cmake similarity index 100% rename from .gitlab/ci/configure_fedora38_ninja_multi.cmake rename to .gitlab/ci/configure_fedora39_ninja_multi.cmake diff --git a/.gitlab/ci/configure_fedora38_ninja_clang.cmake b/.gitlab/ci/configure_fedora39_ninja_multi_clang.cmake similarity index 81% rename from .gitlab/ci/configure_fedora38_ninja_clang.cmake rename to .gitlab/ci/configure_fedora39_ninja_multi_clang.cmake index 848c5b6739..49552d6bd8 100644 --- a/.gitlab/ci/configure_fedora38_ninja_clang.cmake +++ b/.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") diff --git a/.gitlab/ci/configure_fedora38_sphinx.cmake b/.gitlab/ci/configure_fedora39_sphinx.cmake similarity index 100% rename from .gitlab/ci/configure_fedora38_sphinx.cmake rename to .gitlab/ci/configure_fedora39_sphinx.cmake diff --git a/.gitlab/ci/configure_fedora38_sphinx_package.cmake b/.gitlab/ci/configure_fedora39_sphinx_package.cmake similarity index 100% rename from .gitlab/ci/configure_fedora38_sphinx_package.cmake rename to .gitlab/ci/configure_fedora39_sphinx_package.cmake diff --git a/.gitlab/ci/configure_fedora38_tidy.cmake b/.gitlab/ci/configure_fedora39_tidy.cmake similarity index 78% rename from .gitlab/ci/configure_fedora38_tidy.cmake rename to .gitlab/ci/configure_fedora39_tidy.cmake index 5b062da373..4ed1eb381b 100644 --- a/.gitlab/ci/configure_fedora38_tidy.cmake +++ b/.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") diff --git a/.gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora39_asan.lsan.supp similarity index 100% rename from .gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp rename to .gitlab/ci/ctest_memcheck_fedora39_asan.lsan.supp diff --git a/.gitlab/ci/env_fedora38_common_clang.sh b/.gitlab/ci/env_fedora38_common_clang.sh deleted file mode 100644 index fc9c04134b..0000000000 --- a/.gitlab/ci/env_fedora38_common_clang.sh +++ /dev/null @@ -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 diff --git a/.gitlab/ci/env_fedora38_hip_radeon.sh b/.gitlab/ci/env_fedora38_hip_radeon.sh deleted file mode 100644 index 812ef5a1c7..0000000000 --- a/.gitlab/ci/env_fedora38_hip_radeon.sh +++ /dev/null @@ -1 +0,0 @@ -export HIPCXX=/usr/bin/clang++-16 diff --git a/.gitlab/ci/env_fedora38_makefiles_clang.sh b/.gitlab/ci/env_fedora38_makefiles_clang.sh deleted file mode 100644 index 9f3edde7d7..0000000000 --- a/.gitlab/ci/env_fedora38_makefiles_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora38_common_clang.sh diff --git a/.gitlab/ci/env_fedora38_makefiles_symlinked.cmake b/.gitlab/ci/env_fedora38_makefiles_symlinked.cmake deleted file mode 100644 index 2accabf54b..0000000000 --- a/.gitlab/ci/env_fedora38_makefiles_symlinked.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/env_fedora38_makefiles.cmake") diff --git a/.gitlab/ci/env_fedora38_makefiles_symlinked.sh b/.gitlab/ci/env_fedora38_makefiles_symlinked.sh deleted file mode 100644 index 452d378573..0000000000 --- a/.gitlab/ci/env_fedora38_makefiles_symlinked.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora38_makefiles.sh diff --git a/.gitlab/ci/env_fedora38_ninja_clang.sh b/.gitlab/ci/env_fedora38_ninja_clang.sh deleted file mode 100644 index 9f3edde7d7..0000000000 --- a/.gitlab/ci/env_fedora38_ninja_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora38_common_clang.sh diff --git a/.gitlab/ci/env_fedora38_ninja_multi_clang.sh b/.gitlab/ci/env_fedora38_ninja_multi_clang.sh deleted file mode 100644 index 9f3edde7d7..0000000000 --- a/.gitlab/ci/env_fedora38_ninja_multi_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora38_common_clang.sh diff --git a/.gitlab/ci/env_fedora38_asan.sh b/.gitlab/ci/env_fedora39_asan.sh similarity index 100% rename from .gitlab/ci/env_fedora38_asan.sh rename to .gitlab/ci/env_fedora39_asan.sh diff --git a/.gitlab/ci/env_fedora38_clang_analyzer.sh b/.gitlab/ci/env_fedora39_clang_analyzer.sh similarity index 100% rename from .gitlab/ci/env_fedora38_clang_analyzer.sh rename to .gitlab/ci/env_fedora39_clang_analyzer.sh diff --git a/.gitlab/ci/env_fedora39_common_clang.sh b/.gitlab/ci/env_fedora39_common_clang.sh new file mode 100644 index 0000000000..076669b893 --- /dev/null +++ b/.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 diff --git a/.gitlab/ci/env_fedora38_extdeps.sh b/.gitlab/ci/env_fedora39_extdeps.sh similarity index 100% rename from .gitlab/ci/env_fedora38_extdeps.sh rename to .gitlab/ci/env_fedora39_extdeps.sh diff --git a/.gitlab/ci/env_fedora39_hip_radeon.sh b/.gitlab/ci/env_fedora39_hip_radeon.sh new file mode 100644 index 0000000000..0f7df8d954 --- /dev/null +++ b/.gitlab/ci/env_fedora39_hip_radeon.sh @@ -0,0 +1 @@ +export HIPCXX=/usr/bin/clang++-17 diff --git a/.gitlab/ci/env_fedora38_makefiles.cmake b/.gitlab/ci/env_fedora39_makefiles.cmake similarity index 100% rename from .gitlab/ci/env_fedora38_makefiles.cmake rename to .gitlab/ci/env_fedora39_makefiles.cmake diff --git a/.gitlab/ci/env_fedora38_makefiles.sh b/.gitlab/ci/env_fedora39_makefiles.sh similarity index 100% rename from .gitlab/ci/env_fedora38_makefiles.sh rename to .gitlab/ci/env_fedora39_makefiles.sh diff --git a/.gitlab/ci/env_fedora39_makefiles_clang.sh b/.gitlab/ci/env_fedora39_makefiles_clang.sh new file mode 100644 index 0000000000..6200f82046 --- /dev/null +++ b/.gitlab/ci/env_fedora39_makefiles_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora39_common_clang.sh diff --git a/.gitlab/ci/env_fedora39_makefiles_symlinked.cmake b/.gitlab/ci/env_fedora39_makefiles_symlinked.cmake new file mode 100644 index 0000000000..052e9a7811 --- /dev/null +++ b/.gitlab/ci/env_fedora39_makefiles_symlinked.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/env_fedora39_makefiles.cmake") diff --git a/.gitlab/ci/env_fedora39_makefiles_symlinked.sh b/.gitlab/ci/env_fedora39_makefiles_symlinked.sh new file mode 100644 index 0000000000..39ac18921d --- /dev/null +++ b/.gitlab/ci/env_fedora39_makefiles_symlinked.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora39_makefiles.sh diff --git a/.gitlab/ci/env_fedora38_ninja.sh b/.gitlab/ci/env_fedora39_ninja.sh similarity index 100% rename from .gitlab/ci/env_fedora38_ninja.sh rename to .gitlab/ci/env_fedora39_ninja.sh diff --git a/.gitlab/ci/env_fedora39_ninja_clang.sh b/.gitlab/ci/env_fedora39_ninja_clang.sh new file mode 100644 index 0000000000..6200f82046 --- /dev/null +++ b/.gitlab/ci/env_fedora39_ninja_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora39_common_clang.sh diff --git a/.gitlab/ci/env_fedora38_ninja_multi.sh b/.gitlab/ci/env_fedora39_ninja_multi.sh similarity index 100% rename from .gitlab/ci/env_fedora38_ninja_multi.sh rename to .gitlab/ci/env_fedora39_ninja_multi.sh diff --git a/.gitlab/ci/env_fedora39_ninja_multi_clang.sh b/.gitlab/ci/env_fedora39_ninja_multi_clang.sh new file mode 100644 index 0000000000..6200f82046 --- /dev/null +++ b/.gitlab/ci/env_fedora39_ninja_multi_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora39_common_clang.sh diff --git a/.gitlab/ci/pre_build_fedora38_tidy.sh b/.gitlab/ci/pre_build_fedora39_tidy.sh similarity index 100% rename from .gitlab/ci/pre_build_fedora38_tidy.sh rename to .gitlab/ci/pre_build_fedora39_tidy.sh diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 88940579b1..f529ab25c6 100644 --- a/.gitlab/os-linux.yml +++ b/.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: diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml index caa2119c31..56793af442 100644 --- a/.gitlab/upload.yml +++ b/.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