mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-30 19:29:18 -06:00
gitlab-ci: use Fedora 37 images and environments
This commit is contained in:
@@ -57,7 +57,7 @@ p:source-package:
|
||||
|
||||
p:doc-package:
|
||||
extends:
|
||||
- .fedora36_sphinx_package
|
||||
- .fedora37_sphinx_package
|
||||
- .cmake_prep_doc_linux
|
||||
- .linux_builder_tags_qt
|
||||
- .cmake_doc_artifacts
|
||||
@@ -105,16 +105,16 @@ l:iwyu-debian10:
|
||||
- .linux_builder_tags
|
||||
- .run_automatically
|
||||
|
||||
l:tidy-fedora36:
|
||||
l:tidy-fedora37:
|
||||
extends:
|
||||
- .fedora36_tidy
|
||||
- .fedora37_tidy
|
||||
- .cmake_build_linux
|
||||
- .linux_builder_tags_qt
|
||||
- .run_automatically
|
||||
|
||||
l:sphinx-fedora36:
|
||||
l:sphinx-fedora37:
|
||||
extends:
|
||||
- .fedora36_sphinx
|
||||
- .fedora37_sphinx
|
||||
- .cmake_build_linux
|
||||
- .linux_builder_tags_qt
|
||||
- .run_automatically
|
||||
@@ -122,9 +122,9 @@ l:sphinx-fedora36:
|
||||
CMAKE_CI_JOB_CONTINUOUS: "true"
|
||||
CMAKE_CI_JOB_HELP: "true"
|
||||
|
||||
l:clang-analyzer-fedora36:
|
||||
l:clang-analyzer-fedora37:
|
||||
extends:
|
||||
- .fedora36_clang_analyzer
|
||||
- .fedora37_clang_analyzer
|
||||
- .cmake_build_linux
|
||||
- .linux_builder_tags_qt
|
||||
- .run_automatically
|
||||
@@ -196,17 +196,17 @@ t:debian10-makefiles-clang:
|
||||
variables:
|
||||
CMAKE_CI_JOB_NIGHTLY: "true"
|
||||
|
||||
t:fedora36-makefiles:
|
||||
t:fedora37-makefiles:
|
||||
extends:
|
||||
- .fedora36_makefiles
|
||||
- .fedora37_makefiles
|
||||
- .cmake_test_linux_release
|
||||
- .linux_builder_tags_qt
|
||||
- .run_dependent
|
||||
- .needs_centos6_x86_64
|
||||
|
||||
t:fedora36-makefiles-nospace:
|
||||
t:fedora37-makefiles-nospace:
|
||||
extends:
|
||||
- .fedora36_makefiles
|
||||
- .fedora37_makefiles
|
||||
- .cmake_test_linux_release
|
||||
- .linux_builder_tags_qt
|
||||
- .cmake_junit_artifacts
|
||||
@@ -214,7 +214,7 @@ t:fedora36-makefiles-nospace:
|
||||
- .needs_centos6_x86_64
|
||||
variables:
|
||||
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
|
||||
CMAKE_CI_BUILD_NAME: fedora36_makefiles_nospace
|
||||
CMAKE_CI_BUILD_NAME: fedora37_makefiles_nospace
|
||||
CMAKE_CI_JOB_NIGHTLY: "true"
|
||||
|
||||
t:cuda9.2-nvidia:
|
||||
@@ -295,9 +295,9 @@ t:linux-gcc-cxx-modules-ninja-multi:
|
||||
variables:
|
||||
CMAKE_CI_JOB_NIGHTLY: "true"
|
||||
|
||||
b:fedora36-ninja:
|
||||
b:fedora37-ninja:
|
||||
extends:
|
||||
- .fedora36_ninja
|
||||
- .fedora37_ninja
|
||||
- .cmake_build_linux
|
||||
- .cmake_build_artifacts
|
||||
- .linux_builder_tags_qt
|
||||
@@ -332,40 +332,40 @@ b:debian10-aarch64-extdeps:
|
||||
variables:
|
||||
CMAKE_CI_JOB_NIGHTLY: "true"
|
||||
|
||||
b:fedora36-extdeps:
|
||||
b:fedora37-extdeps:
|
||||
extends:
|
||||
- .fedora36_extdeps
|
||||
- .fedora37_extdeps
|
||||
- .cmake_build_linux_standalone
|
||||
- .linux_builder_tags
|
||||
- .run_manually
|
||||
variables:
|
||||
CMAKE_CI_JOB_NIGHTLY: "true"
|
||||
|
||||
t:fedora36-ninja:
|
||||
t:fedora37-ninja:
|
||||
extends:
|
||||
- .fedora36_ninja
|
||||
- .fedora37_ninja
|
||||
- .cmake_test_linux
|
||||
- .linux_builder_tags_x11
|
||||
- .cmake_test_artifacts
|
||||
- .run_dependent
|
||||
dependencies:
|
||||
- b:fedora36-ninja
|
||||
- b:fedora37-ninja
|
||||
needs:
|
||||
- b:fedora36-ninja
|
||||
- b:fedora37-ninja
|
||||
variables:
|
||||
CMAKE_CI_JOB_CONTINUOUS: "true"
|
||||
|
||||
t:fedora36-ninja-multi:
|
||||
t:fedora37-ninja-multi:
|
||||
extends:
|
||||
- .fedora36_ninja_multi
|
||||
- .fedora37_ninja_multi
|
||||
- .cmake_test_linux_external
|
||||
- .linux_builder_tags_qt
|
||||
- .cmake_junit_artifacts
|
||||
- .run_dependent
|
||||
dependencies:
|
||||
- t:fedora36-ninja
|
||||
- t:fedora37-ninja
|
||||
needs:
|
||||
- t:fedora36-ninja
|
||||
- t:fedora37-ninja
|
||||
|
||||
t:intel2016-makefiles:
|
||||
extends:
|
||||
@@ -704,9 +704,9 @@ u:linux-aarch64-package:
|
||||
|
||||
## Sanitizer builds
|
||||
|
||||
b:fedora36-asan:
|
||||
b:fedora37-asan:
|
||||
extends:
|
||||
- .fedora36_asan
|
||||
- .fedora37_asan
|
||||
- .cmake_build_linux
|
||||
- .cmake_build_artifacts
|
||||
- .linux_builder_tags_qt
|
||||
@@ -714,16 +714,16 @@ b:fedora36-asan:
|
||||
variables:
|
||||
CMAKE_CI_JOB_NIGHTLY: "true"
|
||||
|
||||
t:fedora36-asan:
|
||||
t:fedora37-asan:
|
||||
extends:
|
||||
- .fedora36_asan
|
||||
- .fedora37_asan
|
||||
- .cmake_memcheck_linux
|
||||
- .linux_builder_tags_qt
|
||||
- .run_dependent
|
||||
dependencies:
|
||||
- b:fedora36-asan
|
||||
- b:fedora37-asan
|
||||
needs:
|
||||
- b:fedora36-asan
|
||||
- b:fedora37-asan
|
||||
variables:
|
||||
CMAKE_CI_JOB_NIGHTLY: "true"
|
||||
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora36_common.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_fedora36_common.cmake")
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common.cmake")
|
||||
1
.gitlab/ci/configure_fedora37_clang_analyzer.cmake
Normal file
1
.gitlab/ci/configure_fedora37_clang_analyzer.cmake
Normal file
@@ -0,0 +1 @@
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common.cmake")
|
||||
@@ -10,4 +10,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_fedora36_common.cmake")
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common.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_fedora36_common.cmake")
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common.cmake")
|
||||
@@ -5,7 +5,7 @@
|
||||
### Release
|
||||
|
||||
.linux_prep_source:
|
||||
image: "fedora:36"
|
||||
image: "fedora:37"
|
||||
|
||||
variables:
|
||||
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
|
||||
@@ -68,8 +68,8 @@
|
||||
|
||||
### Fedora
|
||||
|
||||
.fedora36:
|
||||
image: "kitware/cmake:ci-fedora36-x86_64-2022-10-04"
|
||||
.fedora37:
|
||||
image: "kitware/cmake:ci-fedora37-x86_64-2022-11-16"
|
||||
|
||||
variables:
|
||||
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
|
||||
@@ -77,37 +77,37 @@
|
||||
|
||||
#### Lint builds
|
||||
|
||||
.fedora36_tidy:
|
||||
extends: .fedora36
|
||||
.fedora37_tidy:
|
||||
extends: .fedora37
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora36_tidy
|
||||
CMAKE_CONFIGURATION: fedora37_tidy
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
CMAKE_CI_NO_INSTALL: 1
|
||||
|
||||
.fedora36_clang_analyzer:
|
||||
extends: .fedora36
|
||||
.fedora37_clang_analyzer:
|
||||
extends: .fedora37
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora36_clang_analyzer
|
||||
CMAKE_CONFIGURATION: fedora37_clang_analyzer
|
||||
CMAKE_CI_BUILD_TYPE: Debug
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
CMAKE_CI_NO_INSTALL: 1
|
||||
|
||||
.fedora36_sphinx:
|
||||
extends: .fedora36
|
||||
.fedora37_sphinx:
|
||||
extends: .fedora37
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora36_sphinx
|
||||
CMAKE_CONFIGURATION: fedora37_sphinx
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
|
||||
CMAKE_CI_NO_INSTALL: 1
|
||||
|
||||
.fedora36_sphinx_package:
|
||||
extends: .fedora36
|
||||
.fedora37_sphinx_package:
|
||||
extends: .fedora37
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora36_sphinx_package
|
||||
CMAKE_CONFIGURATION: fedora37_sphinx_package
|
||||
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
|
||||
|
||||
#### Build and test
|
||||
@@ -153,35 +153,35 @@
|
||||
CMAKE_CI_BUILD_TYPE: Release
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
|
||||
.fedora36_extdeps:
|
||||
extends: .fedora36
|
||||
.fedora37_extdeps:
|
||||
extends: .fedora37
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora36_extdeps
|
||||
CMAKE_CONFIGURATION: fedora37_extdeps
|
||||
CMAKE_CI_BUILD_TYPE: Release
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
|
||||
.fedora36_ninja:
|
||||
extends: .fedora36
|
||||
.fedora37_ninja:
|
||||
extends: .fedora37
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora36_ninja
|
||||
CMAKE_CONFIGURATION: fedora37_ninja
|
||||
CMAKE_CI_BUILD_TYPE: Release
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
|
||||
.fedora36_ninja_multi:
|
||||
extends: .fedora36
|
||||
.fedora37_ninja_multi:
|
||||
extends: .fedora37
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora36_ninja_multi
|
||||
CMAKE_CONFIGURATION: fedora37_ninja_multi
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
CMAKE_GENERATOR: "Ninja Multi-Config"
|
||||
|
||||
.fedora36_makefiles:
|
||||
extends: .fedora36
|
||||
.fedora37_makefiles:
|
||||
extends: .fedora37
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora36_makefiles
|
||||
CMAKE_CONFIGURATION: fedora37_makefiles
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
CMAKE_GENERATOR: "Unix Makefiles"
|
||||
|
||||
@@ -213,13 +213,13 @@
|
||||
CTEST_MEMORYCHECK_TYPE: AddressSanitizer
|
||||
CTEST_MEMORYCHECK_SANITIZER_OPTIONS: ""
|
||||
|
||||
.fedora36_asan:
|
||||
.fedora37_asan:
|
||||
extends:
|
||||
- .fedora36
|
||||
- .fedora37
|
||||
- .fedora_asan_addon
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora36_asan
|
||||
CMAKE_CONFIGURATION: fedora37_asan
|
||||
|
||||
### Intel Compiler
|
||||
|
||||
@@ -437,7 +437,7 @@
|
||||
|
||||
.cmake_codespell_linux:
|
||||
stage: build
|
||||
extends: .fedora36
|
||||
extends: .fedora37
|
||||
script:
|
||||
- codespell
|
||||
interruptible: true
|
||||
@@ -580,7 +580,7 @@
|
||||
.cmake_org_help:
|
||||
stage: build
|
||||
extends:
|
||||
- .fedora36
|
||||
- .fedora37
|
||||
- .linux_builder_tags
|
||||
- .cmake_org_help_artifacts
|
||||
script:
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Steps for uploading artifacts
|
||||
|
||||
.rsync_upload_package:
|
||||
image: "fedora:36"
|
||||
image: "fedora:37"
|
||||
stage: upload
|
||||
tags:
|
||||
- cmake
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
.rsync_upload_help:
|
||||
stage: upload
|
||||
image: "fedora:36"
|
||||
image: "fedora:37"
|
||||
tags:
|
||||
- cmake
|
||||
- docker
|
||||
|
||||
Reference in New Issue
Block a user