ci: use Fedora 38 images and environments

This commit is contained in:
Brad King
2023-05-22 12:50:13 -04:00
parent b69c63d3aa
commit bdaa9e1e4e
33 changed files with 86 additions and 86 deletions
+34 -34
View File
@@ -55,7 +55,7 @@ p:source-package:
p:doc-package:
extends:
- .fedora37_sphinx_package
- .fedora38_sphinx_package
- .cmake_prep_doc_linux
- .linux_x86_64_tags
- .cmake_doc_artifacts
@@ -103,16 +103,16 @@ l:iwyu-debian10:
- .linux_x86_64_tags
- .run_automatically
l:tidy-fedora37:
l:tidy-fedora38:
extends:
- .fedora37_tidy
- .fedora38_tidy
- .cmake_build_linux
- .linux_x86_64_tags
- .run_automatically
l:sphinx-fedora37:
l:sphinx-fedora38:
extends:
- .fedora37_sphinx
- .fedora38_sphinx
- .cmake_build_linux
- .cmake_sphinx_artifacts
- .linux_x86_64_tags
@@ -121,9 +121,9 @@ l:sphinx-fedora37:
CMAKE_CI_JOB_CONTINUOUS: "true"
CMAKE_CI_JOB_HELP: "true"
l:clang-analyzer-fedora37:
l:clang-analyzer-fedora38:
extends:
- .fedora37_clang_analyzer
- .fedora38_clang_analyzer
- .cmake_build_linux
- .linux_x86_64_tags
- .run_automatically
@@ -195,9 +195,9 @@ t:debian10-makefiles-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora37-ninja-clang:
t:fedora38-ninja-clang:
extends:
- .fedora37_ninja_clang
- .fedora38_ninja_clang
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@@ -205,9 +205,9 @@ t:fedora37-ninja-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora37-makefiles-clang:
t:fedora38-makefiles-clang:
extends:
- .fedora37_makefiles_clang
- .fedora38_makefiles_clang
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@@ -215,17 +215,17 @@ t:fedora37-makefiles-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora37-makefiles:
t:fedora38-makefiles:
extends:
- .fedora37_makefiles
- .fedora38_makefiles
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
- .needs_centos6_x86_64
t:fedora37-makefiles-nospace:
t:fedora38-makefiles-nospace:
extends:
- .fedora37_makefiles
- .fedora38_makefiles
- .cmake_test_linux_release
- .linux_x86_64_tags
- .cmake_junit_artifacts
@@ -233,7 +233,7 @@ t:fedora37-makefiles-nospace:
- .needs_centos6_x86_64
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
CMAKE_CI_BUILD_NAME: fedora37_makefiles_nospace
CMAKE_CI_BUILD_NAME: fedora38_makefiles_nospace
CMAKE_CI_JOB_NIGHTLY: "true"
t:nvhpc22.11-ninja:
@@ -354,9 +354,9 @@ t:linux-clang-cxx-modules-ninja-multi:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
b:fedora37-ninja:
b:fedora38-ninja:
extends:
- .fedora37_ninja
- .fedora38_ninja
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_x86_64_tags
@@ -391,40 +391,40 @@ b:debian10-aarch64-extdeps:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
b:fedora37-extdeps:
b:fedora38-extdeps:
extends:
- .fedora37_extdeps
- .fedora38_extdeps
- .cmake_build_linux_standalone
- .linux_x86_64_tags
- .run_manually
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora37-ninja:
t:fedora38-ninja:
extends:
- .fedora37_ninja
- .fedora38_ninja
- .cmake_test_linux
- .linux_x86_64_tags_x11
- .cmake_test_artifacts
- .run_dependent
dependencies:
- b:fedora37-ninja
- b:fedora38-ninja
needs:
- b:fedora37-ninja
- b:fedora38-ninja
variables:
CMAKE_CI_JOB_CONTINUOUS: "true"
t:fedora37-ninja-multi:
t:fedora38-ninja-multi:
extends:
- .fedora37_ninja_multi
- .fedora38_ninja_multi
- .cmake_test_linux_external
- .linux_x86_64_tags
- .cmake_junit_artifacts
- .run_dependent
dependencies:
- t:fedora37-ninja
- t:fedora38-ninja
needs:
- t:fedora37-ninja
- t:fedora38-ninja
t:intel2016-makefiles:
extends:
@@ -791,9 +791,9 @@ u:linux-aarch64-package:
## Sanitizer builds
b:fedora37-asan:
b:fedora38-asan:
extends:
- .fedora37_asan
- .fedora38_asan
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_x86_64_tags
@@ -801,16 +801,16 @@ b:fedora37-asan:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora37-asan:
t:fedora38-asan:
extends:
- .fedora37_asan
- .fedora38_asan
- .cmake_memcheck_linux
- .linux_x86_64_tags
- .run_dependent
dependencies:
- b:fedora37-asan
- b:fedora38-asan
needs:
- b:fedora37-asan
- b:fedora38-asan
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
@@ -1,3 +0,0 @@
set(configure_no_sccache 1)
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common.cmake")
@@ -1 +0,0 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common_clang.cmake")
@@ -1 +0,0 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common_clang.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")
@@ -0,0 +1,3 @@
set(configure_no_sccache 1)
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake")
@@ -0,0 +1 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.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")
@@ -0,0 +1 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.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")
@@ -1 +0,0 @@
. .gitlab/ci/env_fedora37_common_clang.sh
-1
View File
@@ -1 +0,0 @@
. .gitlab/ci/env_fedora37_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
@@ -0,0 +1 @@
. .gitlab/ci/env_fedora38_common_clang.sh
+1
View File
@@ -0,0 +1 @@
. .gitlab/ci/env_fedora38_common_clang.sh
+38 -38
View File
@@ -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:
+2 -2
View File
@@ -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