summaryrefslogtreecommitdiffstats
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-05-22 16:50:13 (GMT)
committerBrad King <brad.king@kitware.com>2023-05-22 21:16:12 (GMT)
commitbdaa9e1e4ec626a9acc818553424e414c57633dd (patch)
tree2517a295246f7c79fd4b4871e1649cb92605191a /.gitlab
parentb69c63d3aa07f2e653091602b08140f782d01084 (diff)
downloadCMake-bdaa9e1e4ec626a9acc818553424e414c57633dd.zip
CMake-bdaa9e1e4ec626a9acc818553424e414c57633dd.tar.gz
CMake-bdaa9e1e4ec626a9acc818553424e414c57633dd.tar.bz2
ci: use Fedora 38 images and environments
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/configure_fedora37_clang_analyzer.cmake3
-rw-r--r--.gitlab/ci/configure_fedora37_makefiles_clang.cmake1
-rw-r--r--.gitlab/ci/configure_fedora37_ninja_clang.cmake1
-rw-r--r--.gitlab/ci/configure_fedora38_asan.cmake (renamed from .gitlab/ci/configure_fedora37_asan.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora38_clang_analyzer.cmake3
-rw-r--r--.gitlab/ci/configure_fedora38_common.cmake (renamed from .gitlab/ci/configure_fedora37_common.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora38_common_clang.cmake (renamed from .gitlab/ci/configure_fedora37_common_clang.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora38_extdeps.cmake (renamed from .gitlab/ci/configure_fedora37_extdeps.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora38_makefiles.cmake (renamed from .gitlab/ci/configure_fedora37_makefiles.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora38_makefiles_clang.cmake1
-rw-r--r--.gitlab/ci/configure_fedora38_ninja.cmake (renamed from .gitlab/ci/configure_fedora37_ninja.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora38_ninja_clang.cmake1
-rw-r--r--.gitlab/ci/configure_fedora38_ninja_multi.cmake (renamed from .gitlab/ci/configure_fedora37_ninja_multi.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora38_sphinx.cmake (renamed from .gitlab/ci/configure_fedora37_sphinx.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora38_sphinx_package.cmake (renamed from .gitlab/ci/configure_fedora37_sphinx_package.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora38_tidy.cmake (renamed from .gitlab/ci/configure_fedora37_tidy.cmake)2
-rw-r--r--.gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp (renamed from .gitlab/ci/ctest_memcheck_fedora37_asan.lsan.supp)0
-rw-r--r--.gitlab/ci/env_fedora37_makefiles_clang.sh1
-rw-r--r--.gitlab/ci/env_fedora37_ninja_clang.sh1
-rw-r--r--.gitlab/ci/env_fedora38_asan.sh (renamed from .gitlab/ci/env_fedora37_asan.sh)0
-rw-r--r--.gitlab/ci/env_fedora38_clang_analyzer.sh (renamed from .gitlab/ci/env_fedora37_clang_analyzer.sh)0
-rw-r--r--.gitlab/ci/env_fedora38_common_clang.sh (renamed from .gitlab/ci/env_fedora37_common_clang.sh)4
-rw-r--r--.gitlab/ci/env_fedora38_extdeps.sh (renamed from .gitlab/ci/env_fedora37_extdeps.sh)0
-rw-r--r--.gitlab/ci/env_fedora38_makefiles.cmake (renamed from .gitlab/ci/env_fedora37_makefiles.cmake)0
-rw-r--r--.gitlab/ci/env_fedora38_makefiles.sh (renamed from .gitlab/ci/env_fedora37_makefiles.sh)0
-rw-r--r--.gitlab/ci/env_fedora38_makefiles_clang.sh1
-rw-r--r--.gitlab/ci/env_fedora38_ninja.sh (renamed from .gitlab/ci/env_fedora37_ninja_multi.sh)0
-rw-r--r--.gitlab/ci/env_fedora38_ninja_clang.sh1
-rw-r--r--.gitlab/ci/env_fedora38_ninja_multi.sh (renamed from .gitlab/ci/env_fedora37_ninja.sh)0
-rw-r--r--.gitlab/ci/pre_build_fedora38_tidy.sh (renamed from .gitlab/ci/pre_build_fedora37_tidy.sh)0
-rw-r--r--.gitlab/os-linux.yml76
-rw-r--r--.gitlab/upload.yml4
32 files changed, 52 insertions, 52 deletions
diff --git a/.gitlab/ci/configure_fedora37_clang_analyzer.cmake b/.gitlab/ci/configure_fedora37_clang_analyzer.cmake
deleted file mode 100644
index 943c926..0000000
--- a/.gitlab/ci/configure_fedora37_clang_analyzer.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(configure_no_sccache 1)
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common.cmake")
diff --git a/.gitlab/ci/configure_fedora37_makefiles_clang.cmake b/.gitlab/ci/configure_fedora37_makefiles_clang.cmake
deleted file mode 100644
index 7b82a9a..0000000
--- a/.gitlab/ci/configure_fedora37_makefiles_clang.cmake
+++ /dev/null
@@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common_clang.cmake")
diff --git a/.gitlab/ci/configure_fedora37_ninja_clang.cmake b/.gitlab/ci/configure_fedora37_ninja_clang.cmake
deleted file mode 100644
index 7b82a9a..0000000
--- a/.gitlab/ci/configure_fedora37_ninja_clang.cmake
+++ /dev/null
@@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common_clang.cmake")
diff --git a/.gitlab/ci/configure_fedora37_asan.cmake b/.gitlab/ci/configure_fedora38_asan.cmake
index 363e953..8eae500 100644
--- a/.gitlab/ci/configure_fedora37_asan.cmake
+++ b/.gitlab/ci/configure_fedora38_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_fedora37_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake")
diff --git a/.gitlab/ci/configure_fedora38_clang_analyzer.cmake b/.gitlab/ci/configure_fedora38_clang_analyzer.cmake
new file mode 100644
index 0000000..c11eef1
--- /dev/null
+++ b/.gitlab/ci/configure_fedora38_clang_analyzer.cmake
@@ -0,0 +1,3 @@
+set(configure_no_sccache 1)
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake")
diff --git a/.gitlab/ci/configure_fedora37_common.cmake b/.gitlab/ci/configure_fedora38_common.cmake
index 4484e26..4484e26 100644
--- a/.gitlab/ci/configure_fedora37_common.cmake
+++ b/.gitlab/ci/configure_fedora38_common.cmake
diff --git a/.gitlab/ci/configure_fedora37_common_clang.cmake b/.gitlab/ci/configure_fedora38_common_clang.cmake
index 70c9df9..70c9df9 100644
--- a/.gitlab/ci/configure_fedora37_common_clang.cmake
+++ b/.gitlab/ci/configure_fedora38_common_clang.cmake
diff --git a/.gitlab/ci/configure_fedora37_extdeps.cmake b/.gitlab/ci/configure_fedora38_extdeps.cmake
index 8e545f5..8e545f5 100644
--- a/.gitlab/ci/configure_fedora37_extdeps.cmake
+++ b/.gitlab/ci/configure_fedora38_extdeps.cmake
diff --git a/.gitlab/ci/configure_fedora37_makefiles.cmake b/.gitlab/ci/configure_fedora38_makefiles.cmake
index c2f9982..c2f9982 100644
--- a/.gitlab/ci/configure_fedora37_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora38_makefiles.cmake
diff --git a/.gitlab/ci/configure_fedora38_makefiles_clang.cmake b/.gitlab/ci/configure_fedora38_makefiles_clang.cmake
new file mode 100644
index 0000000..ff30ad9
--- /dev/null
+++ b/.gitlab/ci/configure_fedora38_makefiles_clang.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.cmake")
diff --git a/.gitlab/ci/configure_fedora37_ninja.cmake b/.gitlab/ci/configure_fedora38_ninja.cmake
index 5b40677..ac6b9f6 100644
--- a/.gitlab/ci/configure_fedora37_ninja.cmake
+++ b/.gitlab/ci/configure_fedora38_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_fedora37_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake")
diff --git a/.gitlab/ci/configure_fedora38_ninja_clang.cmake b/.gitlab/ci/configure_fedora38_ninja_clang.cmake
new file mode 100644
index 0000000..ff30ad9
--- /dev/null
+++ b/.gitlab/ci/configure_fedora38_ninja_clang.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.cmake")
diff --git a/.gitlab/ci/configure_fedora37_ninja_multi.cmake b/.gitlab/ci/configure_fedora38_ninja_multi.cmake
index 94af721..94af721 100644
--- a/.gitlab/ci/configure_fedora37_ninja_multi.cmake
+++ b/.gitlab/ci/configure_fedora38_ninja_multi.cmake
diff --git a/.gitlab/ci/configure_fedora37_sphinx.cmake b/.gitlab/ci/configure_fedora38_sphinx.cmake
index 90d159b..90d159b 100644
--- a/.gitlab/ci/configure_fedora37_sphinx.cmake
+++ b/.gitlab/ci/configure_fedora38_sphinx.cmake
diff --git a/.gitlab/ci/configure_fedora37_sphinx_package.cmake b/.gitlab/ci/configure_fedora38_sphinx_package.cmake
index e839de8..e839de8 100644
--- a/.gitlab/ci/configure_fedora37_sphinx_package.cmake
+++ b/.gitlab/ci/configure_fedora38_sphinx_package.cmake
diff --git a/.gitlab/ci/configure_fedora37_tidy.cmake b/.gitlab/ci/configure_fedora38_tidy.cmake
index f8eb9ab..5b062da 100644
--- a/.gitlab/ci/configure_fedora37_tidy.cmake
+++ b/.gitlab/ci/configure_fedora38_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_fedora37_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake")
diff --git a/.gitlab/ci/ctest_memcheck_fedora37_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp
index 8ec1a03..8ec1a03 100644
--- a/.gitlab/ci/ctest_memcheck_fedora37_asan.lsan.supp
+++ b/.gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp
diff --git a/.gitlab/ci/env_fedora37_makefiles_clang.sh b/.gitlab/ci/env_fedora37_makefiles_clang.sh
deleted file mode 100644
index 9ff1d84..0000000
--- a/.gitlab/ci/env_fedora37_makefiles_clang.sh
+++ /dev/null
@@ -1 +0,0 @@
-. .gitlab/ci/env_fedora37_common_clang.sh
diff --git a/.gitlab/ci/env_fedora37_ninja_clang.sh b/.gitlab/ci/env_fedora37_ninja_clang.sh
deleted file mode 100644
index 9ff1d84..0000000
--- a/.gitlab/ci/env_fedora37_ninja_clang.sh
+++ /dev/null
@@ -1 +0,0 @@
-. .gitlab/ci/env_fedora37_common_clang.sh
diff --git a/.gitlab/ci/env_fedora37_asan.sh b/.gitlab/ci/env_fedora38_asan.sh
index e976486..e976486 100644
--- a/.gitlab/ci/env_fedora37_asan.sh
+++ b/.gitlab/ci/env_fedora38_asan.sh
diff --git a/.gitlab/ci/env_fedora37_clang_analyzer.sh b/.gitlab/ci/env_fedora38_clang_analyzer.sh
index d732c0b..d732c0b 100644
--- a/.gitlab/ci/env_fedora37_clang_analyzer.sh
+++ b/.gitlab/ci/env_fedora38_clang_analyzer.sh
diff --git a/.gitlab/ci/env_fedora37_common_clang.sh b/.gitlab/ci/env_fedora38_common_clang.sh
index b03b757..fc9c041 100644
--- a/.gitlab/ci/env_fedora37_common_clang.sh
+++ b/.gitlab/ci/env_fedora38_common_clang.sh
@@ -1,4 +1,4 @@
-export CC=/usr/bin/clang-15
-export CXX=/usr/bin/clang++-15
+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_fedora37_extdeps.sh b/.gitlab/ci/env_fedora38_extdeps.sh
index 7076e18..7076e18 100644
--- a/.gitlab/ci/env_fedora37_extdeps.sh
+++ b/.gitlab/ci/env_fedora38_extdeps.sh
diff --git a/.gitlab/ci/env_fedora37_makefiles.cmake b/.gitlab/ci/env_fedora38_makefiles.cmake
index ef13cda..ef13cda 100644
--- a/.gitlab/ci/env_fedora37_makefiles.cmake
+++ b/.gitlab/ci/env_fedora38_makefiles.cmake
diff --git a/.gitlab/ci/env_fedora37_makefiles.sh b/.gitlab/ci/env_fedora38_makefiles.sh
index c482642..c482642 100644
--- a/.gitlab/ci/env_fedora37_makefiles.sh
+++ b/.gitlab/ci/env_fedora38_makefiles.sh
diff --git a/.gitlab/ci/env_fedora38_makefiles_clang.sh b/.gitlab/ci/env_fedora38_makefiles_clang.sh
new file mode 100644
index 0000000..9f3edde
--- /dev/null
+++ b/.gitlab/ci/env_fedora38_makefiles_clang.sh
@@ -0,0 +1 @@
+. .gitlab/ci/env_fedora38_common_clang.sh
diff --git a/.gitlab/ci/env_fedora37_ninja_multi.sh b/.gitlab/ci/env_fedora38_ninja.sh
index 217ff30..217ff30 100644
--- a/.gitlab/ci/env_fedora37_ninja_multi.sh
+++ b/.gitlab/ci/env_fedora38_ninja.sh
diff --git a/.gitlab/ci/env_fedora38_ninja_clang.sh b/.gitlab/ci/env_fedora38_ninja_clang.sh
new file mode 100644
index 0000000..9f3edde
--- /dev/null
+++ b/.gitlab/ci/env_fedora38_ninja_clang.sh
@@ -0,0 +1 @@
+. .gitlab/ci/env_fedora38_common_clang.sh
diff --git a/.gitlab/ci/env_fedora37_ninja.sh b/.gitlab/ci/env_fedora38_ninja_multi.sh
index 217ff30..217ff30 100644
--- a/.gitlab/ci/env_fedora37_ninja.sh
+++ b/.gitlab/ci/env_fedora38_ninja_multi.sh
diff --git a/.gitlab/ci/pre_build_fedora37_tidy.sh b/.gitlab/ci/pre_build_fedora38_tidy.sh
index 7580ef1..7580ef1 100644
--- a/.gitlab/ci/pre_build_fedora37_tidy.sh
+++ b/.gitlab/ci/pre_build_fedora38_tidy.sh
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 4ac7772..afce62b 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -5,7 +5,7 @@
### Release
.linux_prep_source:
- image: "fedora:37"
+ image: "fedora:38"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -68,8 +68,8 @@
### Fedora
-.fedora37:
- image: "kitware/cmake:ci-fedora37-x86_64-2023-05-17"
+.fedora38:
+ image: "kitware/cmake:ci-fedora38-x86_64-2023-05-22"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
@@ -77,37 +77,37 @@
#### Lint builds
-.fedora37_tidy:
- extends: .fedora37
+.fedora38_tidy:
+ extends: .fedora38
variables:
- CMAKE_CONFIGURATION: fedora37_tidy
+ CMAKE_CONFIGURATION: fedora38_tidy
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_CI_NO_INSTALL: 1
-.fedora37_clang_analyzer:
- extends: .fedora37
+.fedora38_clang_analyzer:
+ extends: .fedora38
variables:
- CMAKE_CONFIGURATION: fedora37_clang_analyzer
+ CMAKE_CONFIGURATION: fedora38_clang_analyzer
CMAKE_CI_BUILD_TYPE: Debug
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_CI_NO_INSTALL: 1
-.fedora37_sphinx:
- extends: .fedora37
+.fedora38_sphinx:
+ extends: .fedora38
variables:
- CMAKE_CONFIGURATION: fedora37_sphinx
+ CMAKE_CONFIGURATION: fedora38_sphinx
CTEST_NO_WARNINGS_ALLOWED: 1
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
CMAKE_CI_NO_INSTALL: 1
-.fedora37_sphinx_package:
- extends: .fedora37
+.fedora38_sphinx_package:
+ extends: .fedora38
variables:
- CMAKE_CONFIGURATION: fedora37_sphinx_package
+ CMAKE_CONFIGURATION: fedora38_sphinx_package
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
#### Build and test
@@ -153,35 +153,35 @@
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
-.fedora37_extdeps:
- extends: .fedora37
+.fedora38_extdeps:
+ extends: .fedora38
variables:
- CMAKE_CONFIGURATION: fedora37_extdeps
+ CMAKE_CONFIGURATION: fedora38_extdeps
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
-.fedora37_ninja:
- extends: .fedora37
+.fedora38_ninja:
+ extends: .fedora38
variables:
- CMAKE_CONFIGURATION: fedora37_ninja
+ CMAKE_CONFIGURATION: fedora38_ninja
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
-.fedora37_ninja_multi:
- extends: .fedora37
+.fedora38_ninja_multi:
+ extends: .fedora38
variables:
- CMAKE_CONFIGURATION: fedora37_ninja_multi
+ CMAKE_CONFIGURATION: fedora38_ninja_multi
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Ninja Multi-Config"
-.fedora37_makefiles:
- extends: .fedora37
+.fedora38_makefiles:
+ extends: .fedora38
variables:
- CMAKE_CONFIGURATION: fedora37_makefiles
+ CMAKE_CONFIGURATION: fedora38_makefiles
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Unix Makefiles"
@@ -200,18 +200,18 @@
variables:
CMAKE_CONFIGURATION: debian10_ninja_clang
-.fedora37_makefiles_clang:
- extends: .fedora37
+.fedora38_makefiles_clang:
+ extends: .fedora38
variables:
- CMAKE_CONFIGURATION: fedora37_makefiles_clang
+ CMAKE_CONFIGURATION: fedora38_makefiles_clang
CMAKE_GENERATOR: "Unix Makefiles"
-.fedora37_ninja_clang:
- extends: .fedora37
+.fedora38_ninja_clang:
+ extends: .fedora38
variables:
- CMAKE_CONFIGURATION: fedora37_ninja_clang
+ CMAKE_CONFIGURATION: fedora38_ninja_clang
### Sanitizers
@@ -226,13 +226,13 @@
CTEST_MEMORYCHECK_TYPE: AddressSanitizer
CTEST_MEMORYCHECK_SANITIZER_OPTIONS: ""
-.fedora37_asan:
+.fedora38_asan:
extends:
- - .fedora37
+ - .fedora38
- .fedora_asan_addon
variables:
- CMAKE_CONFIGURATION: fedora37_asan
+ CMAKE_CONFIGURATION: fedora38_asan
### Intel Compiler
@@ -478,7 +478,7 @@
.cmake_codespell_linux:
stage: build
- extends: .fedora37
+ extends: .fedora38
script:
- .gitlab/ci/codespell.sh
interruptible: true
@@ -623,7 +623,7 @@
.cmake_org_help:
stage: build
extends:
- - .fedora37
+ - .fedora38
- .linux_x86_64_tags
- .cmake_org_help_artifacts
script:
diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml
index 114808f..caa2119 100644
--- a/.gitlab/upload.yml
+++ b/.gitlab/upload.yml
@@ -1,7 +1,7 @@
# Steps for uploading artifacts
.rsync_upload_package:
- image: "fedora:37"
+ image: "fedora:38"
stage: upload
tags:
- cmake
@@ -21,7 +21,7 @@
.rsync_upload_help:
stage: upload
- image: "fedora:37"
+ image: "fedora:38"
tags:
- cmake
- docker