summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-04-23 18:04:36 (GMT)
committerBrad King <brad.king@kitware.com>2024-04-24 20:45:20 (GMT)
commit9c004ddb3d7d2462fddd5da62baa5a91c6af4ccc (patch)
tree5f5ee7fb9d3f98894d4ca263eadfbf15a59a1dff
parent0f56cc9a4ee61fa779796db6e8858a7db7b659ec (diff)
downloadCMake-9c004ddb3d7d2462fddd5da62baa5a91c6af4ccc.zip
CMake-9c004ddb3d7d2462fddd5da62baa5a91c6af4ccc.tar.gz
CMake-9c004ddb3d7d2462fddd5da62baa5a91c6af4ccc.tar.bz2
ci: use Fedora 40 images and environments
Leave the HIP-specific job on Fedora 39 for now. Issue: #25932
-rw-r--r--.gitlab-ci.yml84
-rw-r--r--.gitlab/ci/configure_fedora39_clang_analyzer.cmake3
-rw-r--r--.gitlab/ci/configure_fedora40_asan.cmake (renamed from .gitlab/ci/configure_fedora39_asan.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora40_clang_analyzer.cmake3
-rw-r--r--.gitlab/ci/configure_fedora40_common.cmake (renamed from .gitlab/ci/configure_fedora39_common.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora40_common_clang.cmake (renamed from .gitlab/ci/configure_fedora39_common_clang.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora40_extdeps.cmake (renamed from .gitlab/ci/configure_fedora39_extdeps.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora40_makefiles.cmake (renamed from .gitlab/ci/configure_fedora39_makefiles.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora40_makefiles_clang.cmake (renamed from .gitlab/ci/configure_fedora39_makefiles_clang.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora40_makefiles_symlinked.cmake (renamed from .gitlab/ci/configure_fedora39_makefiles_symlinked.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora40_ninja.cmake (renamed from .gitlab/ci/configure_fedora39_ninja.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora40_ninja_clang.cmake (renamed from .gitlab/ci/configure_fedora39_ninja_multi_clang.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora40_ninja_multi.cmake (renamed from .gitlab/ci/configure_fedora39_ninja_multi.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora40_ninja_multi_clang.cmake (renamed from .gitlab/ci/configure_fedora39_ninja_clang.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora40_sphinx.cmake (renamed from .gitlab/ci/configure_fedora39_sphinx.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora40_sphinx_package.cmake (renamed from .gitlab/ci/configure_fedora39_sphinx_package.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora40_tidy.cmake (renamed from .gitlab/ci/configure_fedora39_tidy.cmake)2
-rw-r--r--.gitlab/ci/ctest_memcheck_fedora40_asan.lsan.supp (renamed from .gitlab/ci/ctest_memcheck_fedora39_asan.lsan.supp)0
-rw-r--r--.gitlab/ci/env_fedora39_common_clang.sh3
-rw-r--r--.gitlab/ci/env_fedora39_makefiles_clang.sh1
-rw-r--r--.gitlab/ci/env_fedora39_makefiles_symlinked.cmake1
-rw-r--r--.gitlab/ci/env_fedora39_makefiles_symlinked.sh1
-rw-r--r--.gitlab/ci/env_fedora39_ninja_clang.sh1
-rw-r--r--.gitlab/ci/env_fedora39_ninja_multi_clang.sh1
-rw-r--r--.gitlab/ci/env_fedora40_asan.sh (renamed from .gitlab/ci/env_fedora39_asan.sh)0
-rw-r--r--.gitlab/ci/env_fedora40_clang_analyzer.sh (renamed from .gitlab/ci/env_fedora39_clang_analyzer.sh)0
-rw-r--r--.gitlab/ci/env_fedora40_common_clang.sh3
-rw-r--r--.gitlab/ci/env_fedora40_extdeps.sh (renamed from .gitlab/ci/env_fedora39_extdeps.sh)0
-rw-r--r--.gitlab/ci/env_fedora40_makefiles.cmake (renamed from .gitlab/ci/env_fedora39_makefiles.cmake)0
-rw-r--r--.gitlab/ci/env_fedora40_makefiles.sh (renamed from .gitlab/ci/env_fedora39_makefiles.sh)0
-rw-r--r--.gitlab/ci/env_fedora40_makefiles_clang.sh1
-rw-r--r--.gitlab/ci/env_fedora40_makefiles_symlinked.cmake1
-rw-r--r--.gitlab/ci/env_fedora40_makefiles_symlinked.sh1
-rw-r--r--.gitlab/ci/env_fedora40_ninja.sh (renamed from .gitlab/ci/env_fedora39_ninja_multi.sh)0
-rw-r--r--.gitlab/ci/env_fedora40_ninja_clang.sh1
-rw-r--r--.gitlab/ci/env_fedora40_ninja_multi.sh (renamed from .gitlab/ci/env_fedora39_ninja.sh)0
-rw-r--r--.gitlab/ci/env_fedora40_ninja_multi_clang.sh1
-rw-r--r--.gitlab/ci/post_build_fedora40_tidy.sh (renamed from .gitlab/ci/post_build_fedora39_tidy.sh)0
-rw-r--r--.gitlab/ci/pre_build_fedora40_tidy.sh (renamed from .gitlab/ci/pre_build_fedora39_tidy.sh)0
-rw-r--r--.gitlab/os-linux.yml89
-rw-r--r--.gitlab/upload.yml4
41 files changed, 107 insertions, 106 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1508615..fb9484e 100644
--- 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"
diff --git a/.gitlab/ci/configure_fedora39_clang_analyzer.cmake b/.gitlab/ci/configure_fedora39_clang_analyzer.cmake
deleted file mode 100644
index 1bfb3fb..0000000
--- a/.gitlab/ci/configure_fedora39_clang_analyzer.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(configure_no_sccache 1)
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common.cmake")
diff --git a/.gitlab/ci/configure_fedora39_asan.cmake b/.gitlab/ci/configure_fedora40_asan.cmake
index 872517c..ccdba4e 100644
--- a/.gitlab/ci/configure_fedora39_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")
diff --git a/.gitlab/ci/configure_fedora40_clang_analyzer.cmake b/.gitlab/ci/configure_fedora40_clang_analyzer.cmake
new file mode 100644
index 0000000..c210126
--- /dev/null
+++ 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")
diff --git a/.gitlab/ci/configure_fedora39_common.cmake b/.gitlab/ci/configure_fedora40_common.cmake
index 4484e26..4484e26 100644
--- a/.gitlab/ci/configure_fedora39_common.cmake
+++ b/.gitlab/ci/configure_fedora40_common.cmake
diff --git a/.gitlab/ci/configure_fedora39_common_clang.cmake b/.gitlab/ci/configure_fedora40_common_clang.cmake
index 1b3835a..1b3835a 100644
--- a/.gitlab/ci/configure_fedora39_common_clang.cmake
+++ b/.gitlab/ci/configure_fedora40_common_clang.cmake
diff --git a/.gitlab/ci/configure_fedora39_extdeps.cmake b/.gitlab/ci/configure_fedora40_extdeps.cmake
index 8e545f5..8e545f5 100644
--- a/.gitlab/ci/configure_fedora39_extdeps.cmake
+++ b/.gitlab/ci/configure_fedora40_extdeps.cmake
diff --git a/.gitlab/ci/configure_fedora39_makefiles.cmake b/.gitlab/ci/configure_fedora40_makefiles.cmake
index 90d8343..90d8343 100644
--- a/.gitlab/ci/configure_fedora39_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora40_makefiles.cmake
diff --git a/.gitlab/ci/configure_fedora39_makefiles_clang.cmake b/.gitlab/ci/configure_fedora40_makefiles_clang.cmake
index a85ae70..d5739c3 100644
--- a/.gitlab/ci/configure_fedora39_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")
diff --git a/.gitlab/ci/configure_fedora39_makefiles_symlinked.cmake b/.gitlab/ci/configure_fedora40_makefiles_symlinked.cmake
index b53ab66..6a677fd 100644
--- a/.gitlab/ci/configure_fedora39_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")
diff --git a/.gitlab/ci/configure_fedora39_ninja.cmake b/.gitlab/ci/configure_fedora40_ninja.cmake
index 8d04bde..263191f 100644
--- a/.gitlab/ci/configure_fedora39_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")
diff --git a/.gitlab/ci/configure_fedora39_ninja_multi_clang.cmake b/.gitlab/ci/configure_fedora40_ninja_clang.cmake
index 79d3eaa..c760603 100644
--- a/.gitlab/ci/configure_fedora39_ninja_multi_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")
diff --git a/.gitlab/ci/configure_fedora39_ninja_multi.cmake b/.gitlab/ci/configure_fedora40_ninja_multi.cmake
index 94af721..94af721 100644
--- a/.gitlab/ci/configure_fedora39_ninja_multi.cmake
+++ b/.gitlab/ci/configure_fedora40_ninja_multi.cmake
diff --git a/.gitlab/ci/configure_fedora39_ninja_clang.cmake b/.gitlab/ci/configure_fedora40_ninja_multi_clang.cmake
index 79d3eaa..c760603 100644
--- a/.gitlab/ci/configure_fedora39_ninja_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")
diff --git a/.gitlab/ci/configure_fedora39_sphinx.cmake b/.gitlab/ci/configure_fedora40_sphinx.cmake
index 90d159b..90d159b 100644
--- a/.gitlab/ci/configure_fedora39_sphinx.cmake
+++ b/.gitlab/ci/configure_fedora40_sphinx.cmake
diff --git a/.gitlab/ci/configure_fedora39_sphinx_package.cmake b/.gitlab/ci/configure_fedora40_sphinx_package.cmake
index e839de8..e839de8 100644
--- a/.gitlab/ci/configure_fedora39_sphinx_package.cmake
+++ b/.gitlab/ci/configure_fedora40_sphinx_package.cmake
diff --git a/.gitlab/ci/configure_fedora39_tidy.cmake b/.gitlab/ci/configure_fedora40_tidy.cmake
index 7a3eaa6..037732c 100644
--- a/.gitlab/ci/configure_fedora39_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")
diff --git a/.gitlab/ci/ctest_memcheck_fedora39_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora40_asan.lsan.supp
index 8ec1a03..8ec1a03 100644
--- a/.gitlab/ci/ctest_memcheck_fedora39_asan.lsan.supp
+++ b/.gitlab/ci/ctest_memcheck_fedora40_asan.lsan.supp
diff --git a/.gitlab/ci/env_fedora39_common_clang.sh b/.gitlab/ci/env_fedora39_common_clang.sh
deleted file mode 100644
index 076669b..0000000
--- a/.gitlab/ci/env_fedora39_common_clang.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export CC=/usr/bin/clang-17
-export CXX=/usr/bin/clang++-17
-export FC=/usr/bin/flang-new
diff --git a/.gitlab/ci/env_fedora39_makefiles_clang.sh b/.gitlab/ci/env_fedora39_makefiles_clang.sh
deleted file mode 100644
index 6200f82..0000000
--- a/.gitlab/ci/env_fedora39_makefiles_clang.sh
+++ /dev/null
@@ -1 +0,0 @@
-. .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
deleted file mode 100644
index 052e9a7..0000000
--- a/.gitlab/ci/env_fedora39_makefiles_symlinked.cmake
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 39ac189..0000000
--- a/.gitlab/ci/env_fedora39_makefiles_symlinked.sh
+++ /dev/null
@@ -1 +0,0 @@
-. .gitlab/ci/env_fedora39_makefiles.sh
diff --git a/.gitlab/ci/env_fedora39_ninja_clang.sh b/.gitlab/ci/env_fedora39_ninja_clang.sh
deleted file mode 100644
index 6200f82..0000000
--- a/.gitlab/ci/env_fedora39_ninja_clang.sh
+++ /dev/null
@@ -1 +0,0 @@
-. .gitlab/ci/env_fedora39_common_clang.sh
diff --git a/.gitlab/ci/env_fedora39_ninja_multi_clang.sh b/.gitlab/ci/env_fedora39_ninja_multi_clang.sh
deleted file mode 100644
index 6200f82..0000000
--- a/.gitlab/ci/env_fedora39_ninja_multi_clang.sh
+++ /dev/null
@@ -1 +0,0 @@
-. .gitlab/ci/env_fedora39_common_clang.sh
diff --git a/.gitlab/ci/env_fedora39_asan.sh b/.gitlab/ci/env_fedora40_asan.sh
index e976486..e976486 100644
--- a/.gitlab/ci/env_fedora39_asan.sh
+++ b/.gitlab/ci/env_fedora40_asan.sh
diff --git a/.gitlab/ci/env_fedora39_clang_analyzer.sh b/.gitlab/ci/env_fedora40_clang_analyzer.sh
index d732c0b..d732c0b 100644
--- a/.gitlab/ci/env_fedora39_clang_analyzer.sh
+++ b/.gitlab/ci/env_fedora40_clang_analyzer.sh
diff --git a/.gitlab/ci/env_fedora40_common_clang.sh b/.gitlab/ci/env_fedora40_common_clang.sh
new file mode 100644
index 0000000..a3861d0
--- /dev/null
+++ 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
diff --git a/.gitlab/ci/env_fedora39_extdeps.sh b/.gitlab/ci/env_fedora40_extdeps.sh
index 7076e18..7076e18 100644
--- a/.gitlab/ci/env_fedora39_extdeps.sh
+++ b/.gitlab/ci/env_fedora40_extdeps.sh
diff --git a/.gitlab/ci/env_fedora39_makefiles.cmake b/.gitlab/ci/env_fedora40_makefiles.cmake
index ef13cda..ef13cda 100644
--- a/.gitlab/ci/env_fedora39_makefiles.cmake
+++ b/.gitlab/ci/env_fedora40_makefiles.cmake
diff --git a/.gitlab/ci/env_fedora39_makefiles.sh b/.gitlab/ci/env_fedora40_makefiles.sh
index c482642..c482642 100644
--- a/.gitlab/ci/env_fedora39_makefiles.sh
+++ b/.gitlab/ci/env_fedora40_makefiles.sh
diff --git a/.gitlab/ci/env_fedora40_makefiles_clang.sh b/.gitlab/ci/env_fedora40_makefiles_clang.sh
new file mode 100644
index 0000000..2021086
--- /dev/null
+++ b/.gitlab/ci/env_fedora40_makefiles_clang.sh
@@ -0,0 +1 @@
+. .gitlab/ci/env_fedora40_common_clang.sh
diff --git a/.gitlab/ci/env_fedora40_makefiles_symlinked.cmake b/.gitlab/ci/env_fedora40_makefiles_symlinked.cmake
new file mode 100644
index 0000000..d381807
--- /dev/null
+++ b/.gitlab/ci/env_fedora40_makefiles_symlinked.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/env_fedora40_makefiles.cmake")
diff --git a/.gitlab/ci/env_fedora40_makefiles_symlinked.sh b/.gitlab/ci/env_fedora40_makefiles_symlinked.sh
new file mode 100644
index 0000000..5a7584a
--- /dev/null
+++ b/.gitlab/ci/env_fedora40_makefiles_symlinked.sh
@@ -0,0 +1 @@
+. .gitlab/ci/env_fedora40_makefiles.sh
diff --git a/.gitlab/ci/env_fedora39_ninja_multi.sh b/.gitlab/ci/env_fedora40_ninja.sh
index 217ff30..217ff30 100644
--- a/.gitlab/ci/env_fedora39_ninja_multi.sh
+++ b/.gitlab/ci/env_fedora40_ninja.sh
diff --git a/.gitlab/ci/env_fedora40_ninja_clang.sh b/.gitlab/ci/env_fedora40_ninja_clang.sh
new file mode 100644
index 0000000..2021086
--- /dev/null
+++ b/.gitlab/ci/env_fedora40_ninja_clang.sh
@@ -0,0 +1 @@
+. .gitlab/ci/env_fedora40_common_clang.sh
diff --git a/.gitlab/ci/env_fedora39_ninja.sh b/.gitlab/ci/env_fedora40_ninja_multi.sh
index 217ff30..217ff30 100644
--- a/.gitlab/ci/env_fedora39_ninja.sh
+++ b/.gitlab/ci/env_fedora40_ninja_multi.sh
diff --git a/.gitlab/ci/env_fedora40_ninja_multi_clang.sh b/.gitlab/ci/env_fedora40_ninja_multi_clang.sh
new file mode 100644
index 0000000..2021086
--- /dev/null
+++ b/.gitlab/ci/env_fedora40_ninja_multi_clang.sh
@@ -0,0 +1 @@
+. .gitlab/ci/env_fedora40_common_clang.sh
diff --git a/.gitlab/ci/post_build_fedora39_tidy.sh b/.gitlab/ci/post_build_fedora40_tidy.sh
index a36663a..a36663a 100644
--- a/.gitlab/ci/post_build_fedora39_tidy.sh
+++ b/.gitlab/ci/post_build_fedora40_tidy.sh
diff --git a/.gitlab/ci/pre_build_fedora39_tidy.sh b/.gitlab/ci/pre_build_fedora40_tidy.sh
index 7580ef1..7580ef1 100644
--- a/.gitlab/ci/pre_build_fedora39_tidy.sh
+++ b/.gitlab/ci/pre_build_fedora40_tidy.sh
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index de1d64b..2d0fcfd 100644
--- 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:
diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml
index 56793af..6b46313 100644
--- 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