summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-02-01 20:51:33 (GMT)
committerBrad King <brad.king@kitware.com>2022-02-01 22:20:29 (GMT)
commitc76abba04485dd3df76976748d4788e31b072fdc (patch)
tree53c6171c8e39521c67f2c710fef980624fd4bbb1
parent0ab6e5ca5b8062f3d023300bbfff0458d1cc45a9 (diff)
downloadCMake-c76abba04485dd3df76976748d4788e31b072fdc.zip
CMake-c76abba04485dd3df76976748d4788e31b072fdc.tar.gz
CMake-c76abba04485dd3df76976748d4788e31b072fdc.tar.bz2
gitlab-ci: update to Fedora 35 base images
-rw-r--r--.gitlab-ci.yml56
-rw-r--r--.gitlab/ci/configure_fedora34_clang_analyzer.cmake1
-rw-r--r--.gitlab/ci/configure_fedora34_tidy.cmake3
-rw-r--r--.gitlab/ci/configure_fedora35_asan.cmake (renamed from .gitlab/ci/configure_fedora34_asan.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora35_clang_analyzer.cmake1
-rw-r--r--.gitlab/ci/configure_fedora35_common.cmake (renamed from .gitlab/ci/configure_fedora34_common.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora35_makefiles.cmake (renamed from .gitlab/ci/configure_fedora34_makefiles.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora35_ninja.cmake (renamed from .gitlab/ci/configure_fedora34_ninja.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora35_ninja_multi.cmake (renamed from .gitlab/ci/configure_fedora34_ninja_multi.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora35_sphinx.cmake (renamed from .gitlab/ci/configure_fedora34_sphinx.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora35_sphinx_package.cmake (renamed from .gitlab/ci/configure_fedora34_sphinx_package.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora35_tidy.cmake3
-rw-r--r--.gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp (renamed from .gitlab/ci/ctest_memcheck_fedora34_asan.lsan.supp)0
-rw-r--r--.gitlab/ci/env_fedora35_asan.sh (renamed from .gitlab/ci/env_fedora34_asan.sh)0
-rw-r--r--.gitlab/ci/env_fedora35_clang_analyzer.sh (renamed from .gitlab/ci/env_fedora34_clang_analyzer.sh)0
-rw-r--r--.gitlab/ci/env_fedora35_makefiles.cmake (renamed from .gitlab/ci/env_fedora34_makefiles.cmake)0
-rw-r--r--.gitlab/os-linux.yml58
17 files changed, 63 insertions, 63 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2cb4716..d8d3a36 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,7 @@ p:source-package:
p:doc-package:
extends:
- - .fedora34_sphinx_package
+ - .fedora35_sphinx_package
- .cmake_prep_doc_linux
- .linux_builder_tags_qt
- .cmake_doc_artifacts
@@ -119,16 +119,16 @@ l:iwyu-debian10:
- .linux_builder_tags
- .run_automatically
-l:tidy-fedora34:
+l:tidy-fedora35:
extends:
- - .fedora34_tidy
+ - .fedora35_tidy
- .cmake_build_linux
- .linux_builder_tags_qt
- .run_automatically
-l:sphinx-fedora34:
+l:sphinx-fedora35:
extends:
- - .fedora34_sphinx
+ - .fedora35_sphinx
- .cmake_build_linux
- .linux_builder_tags_qt
- .run_automatically
@@ -136,9 +136,9 @@ l:sphinx-fedora34:
CMAKE_CI_JOB_CONTINUOUS: "true"
CMAKE_CI_JOB_HELP: "true"
-l:clang-analyzer-fedora34:
+l:clang-analyzer-fedora35:
extends:
- - .fedora34_clang_analyzer
+ - .fedora35_clang_analyzer
- .cmake_build_linux
- .linux_builder_tags_qt
- .run_automatically
@@ -207,17 +207,17 @@ t:debian10-makefiles-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
-t:fedora34-makefiles:
+t:fedora35-makefiles:
extends:
- - .fedora34_makefiles
+ - .fedora35_makefiles
- .cmake_test_linux_release
- .linux_builder_tags_qt
- .run_dependent
- .needs_centos6_x86_64
-t:fedora34-makefiles-nospace:
+t:fedora35-makefiles-nospace:
extends:
- - .fedora34_makefiles
+ - .fedora35_makefiles
- .cmake_test_linux_release
- .linux_builder_tags_qt
- .cmake_junit_artifacts
@@ -225,7 +225,7 @@ t:fedora34-makefiles-nospace:
- .needs_centos6_x86_64
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
- CMAKE_CI_BUILD_NAME: fedora34_makefiles_nospace
+ CMAKE_CI_BUILD_NAME: fedora35_makefiles_nospace
CMAKE_CI_JOB_NIGHTLY: "true"
t:cuda9.2-nvidia:
@@ -267,37 +267,37 @@ t:hip4.2-radeon:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
-b:fedora34-ninja:
+b:fedora35-ninja:
extends:
- - .fedora34_ninja
+ - .fedora35_ninja
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_builder_tags_qt
- .run_manually
-t:fedora34-ninja:
+t:fedora35-ninja:
extends:
- - .fedora34_ninja
+ - .fedora35_ninja
- .cmake_test_linux
- .linux_builder_tags_x11
- .cmake_test_artifacts
- .run_dependent
dependencies:
- - b:fedora34-ninja
+ - b:fedora35-ninja
needs:
- - b:fedora34-ninja
+ - b:fedora35-ninja
-t:fedora34-ninja-multi:
+t:fedora35-ninja-multi:
extends:
- - .fedora34_ninja_multi
+ - .fedora35_ninja_multi
- .cmake_test_linux_external
- .linux_builder_tags_qt
- .cmake_junit_artifacts
- .run_dependent
dependencies:
- - t:fedora34-ninja
+ - t:fedora35-ninja
needs:
- - t:fedora34-ninja
+ - t:fedora35-ninja
t:intel2016-makefiles:
extends:
@@ -566,9 +566,9 @@ u:linux-aarch64-package:
## Sanitizer builds
-b:fedora34-asan:
+b:fedora35-asan:
extends:
- - .fedora34_asan
+ - .fedora35_asan
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_builder_tags_qt
@@ -576,16 +576,16 @@ b:fedora34-asan:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
-t:fedora34-asan:
+t:fedora35-asan:
extends:
- - .fedora34_asan
+ - .fedora35_asan
- .cmake_memcheck_linux
- .linux_builder_tags_qt
- .run_dependent
dependencies:
- - b:fedora34-asan
+ - b:fedora35-asan
needs:
- - b:fedora34-asan
+ - b:fedora35-asan
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
diff --git a/.gitlab/ci/configure_fedora34_clang_analyzer.cmake b/.gitlab/ci/configure_fedora34_clang_analyzer.cmake
deleted file mode 100644
index e00f8a7..0000000
--- a/.gitlab/ci/configure_fedora34_clang_analyzer.cmake
+++ /dev/null
@@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake")
diff --git a/.gitlab/ci/configure_fedora34_tidy.cmake b/.gitlab/ci/configure_fedora34_tidy.cmake
deleted file mode 100644
index 9c79303..0000000
--- a/.gitlab/ci/configure_fedora34_tidy.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake")
diff --git a/.gitlab/ci/configure_fedora34_asan.cmake b/.gitlab/ci/configure_fedora35_asan.cmake
index c22cdb7..84fefad 100644
--- a/.gitlab/ci/configure_fedora34_asan.cmake
+++ b/.gitlab/ci/configure_fedora35_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_fedora34_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake")
diff --git a/.gitlab/ci/configure_fedora35_clang_analyzer.cmake b/.gitlab/ci/configure_fedora35_clang_analyzer.cmake
new file mode 100644
index 0000000..761a323
--- /dev/null
+++ b/.gitlab/ci/configure_fedora35_clang_analyzer.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake")
diff --git a/.gitlab/ci/configure_fedora34_common.cmake b/.gitlab/ci/configure_fedora35_common.cmake
index 4484e26..4484e26 100644
--- a/.gitlab/ci/configure_fedora34_common.cmake
+++ b/.gitlab/ci/configure_fedora35_common.cmake
diff --git a/.gitlab/ci/configure_fedora34_makefiles.cmake b/.gitlab/ci/configure_fedora35_makefiles.cmake
index a482378..a482378 100644
--- a/.gitlab/ci/configure_fedora34_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora35_makefiles.cmake
diff --git a/.gitlab/ci/configure_fedora34_ninja.cmake b/.gitlab/ci/configure_fedora35_ninja.cmake
index 629f792..e6143b7 100644
--- a/.gitlab/ci/configure_fedora34_ninja.cmake
+++ b/.gitlab/ci/configure_fedora35_ninja.cmake
@@ -8,4 +8,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_fedora34_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake")
diff --git a/.gitlab/ci/configure_fedora34_ninja_multi.cmake b/.gitlab/ci/configure_fedora35_ninja_multi.cmake
index efb4b84..efb4b84 100644
--- a/.gitlab/ci/configure_fedora34_ninja_multi.cmake
+++ b/.gitlab/ci/configure_fedora35_ninja_multi.cmake
diff --git a/.gitlab/ci/configure_fedora34_sphinx.cmake b/.gitlab/ci/configure_fedora35_sphinx.cmake
index 90d159b..90d159b 100644
--- a/.gitlab/ci/configure_fedora34_sphinx.cmake
+++ b/.gitlab/ci/configure_fedora35_sphinx.cmake
diff --git a/.gitlab/ci/configure_fedora34_sphinx_package.cmake b/.gitlab/ci/configure_fedora35_sphinx_package.cmake
index e839de8..e839de8 100644
--- a/.gitlab/ci/configure_fedora34_sphinx_package.cmake
+++ b/.gitlab/ci/configure_fedora35_sphinx_package.cmake
diff --git a/.gitlab/ci/configure_fedora35_tidy.cmake b/.gitlab/ci/configure_fedora35_tidy.cmake
new file mode 100644
index 0000000..752d241
--- /dev/null
+++ b/.gitlab/ci/configure_fedora35_tidy.cmake
@@ -0,0 +1,3 @@
+set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake")
diff --git a/.gitlab/ci/ctest_memcheck_fedora34_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp
index 8ec1a03..8ec1a03 100644
--- a/.gitlab/ci/ctest_memcheck_fedora34_asan.lsan.supp
+++ b/.gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp
diff --git a/.gitlab/ci/env_fedora34_asan.sh b/.gitlab/ci/env_fedora35_asan.sh
index e976486..e976486 100644
--- a/.gitlab/ci/env_fedora34_asan.sh
+++ b/.gitlab/ci/env_fedora35_asan.sh
diff --git a/.gitlab/ci/env_fedora34_clang_analyzer.sh b/.gitlab/ci/env_fedora35_clang_analyzer.sh
index d732c0b..d732c0b 100644
--- a/.gitlab/ci/env_fedora34_clang_analyzer.sh
+++ b/.gitlab/ci/env_fedora35_clang_analyzer.sh
diff --git a/.gitlab/ci/env_fedora34_makefiles.cmake b/.gitlab/ci/env_fedora35_makefiles.cmake
index aa84e23..aa84e23 100644
--- a/.gitlab/ci/env_fedora34_makefiles.cmake
+++ b/.gitlab/ci/env_fedora35_makefiles.cmake
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 90c10a2..a2da7f9 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -5,7 +5,7 @@
### Release
.linux_prep_source:
- image: "fedora:34"
+ image: "fedora:35"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -68,8 +68,8 @@
### Fedora
-.fedora34:
- image: "kitware/cmake:ci-fedora34-x86_64-2021-10-05"
+.fedora35:
+ image: "kitware/cmake:ci-fedora35-x86_64-2022-02-01"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
@@ -77,37 +77,37 @@
#### Lint builds
-.fedora34_tidy:
- extends: .fedora34
+.fedora35_tidy:
+ extends: .fedora35
variables:
- CMAKE_CONFIGURATION: fedora34_tidy
+ CMAKE_CONFIGURATION: fedora35_tidy
CTEST_NO_WARNINGS_ALLOWED: 1
CMake_SKIP_INSTALL: 1
-.fedora34_clang_analyzer:
- extends: .fedora34
+.fedora35_clang_analyzer:
+ extends: .fedora35
variables:
- CMAKE_CONFIGURATION: fedora34_clang_analyzer
+ CMAKE_CONFIGURATION: fedora35_clang_analyzer
CMAKE_CI_BUILD_TYPE: Debug
CTEST_NO_WARNINGS_ALLOWED: 1
CMake_SKIP_INSTALL: 1
-.fedora34_sphinx:
- extends: .fedora34
+.fedora35_sphinx:
+ extends: .fedora35
variables:
- CMAKE_CONFIGURATION: fedora34_sphinx
+ CMAKE_CONFIGURATION: fedora35_sphinx
CTEST_NO_WARNINGS_ALLOWED: 1
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
CMake_SKIP_INSTALL: 1
-.fedora34_sphinx_package:
- extends: .fedora34
+.fedora35_sphinx_package:
+ extends: .fedora35
variables:
- CMAKE_CONFIGURATION: fedora34_sphinx_package
+ CMAKE_CONFIGURATION: fedora35_sphinx_package
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
#### Build and test
@@ -126,27 +126,27 @@
CMAKE_CONFIGURATION: debian10_aarch64_ninja
CTEST_NO_WARNINGS_ALLOWED: 1
-.fedora34_ninja:
- extends: .fedora34
+.fedora35_ninja:
+ extends: .fedora35
variables:
- CMAKE_CONFIGURATION: fedora34_ninja
+ CMAKE_CONFIGURATION: fedora35_ninja
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
-.fedora34_ninja_multi:
- extends: .fedora34
+.fedora35_ninja_multi:
+ extends: .fedora35
variables:
- CMAKE_CONFIGURATION: fedora34_ninja_multi
+ CMAKE_CONFIGURATION: fedora35_ninja_multi
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Ninja Multi-Config"
-.fedora34_makefiles:
- extends: .fedora34
+.fedora35_makefiles:
+ extends: .fedora35
variables:
- CMAKE_CONFIGURATION: fedora34_makefiles
+ CMAKE_CONFIGURATION: fedora35_makefiles
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Unix Makefiles"
@@ -178,13 +178,13 @@
CTEST_MEMORYCHECK_TYPE: AddressSanitizer
CTEST_MEMORYCHECK_SANITIZER_OPTIONS: ""
-.fedora34_asan:
+.fedora35_asan:
extends:
- - .fedora34
+ - .fedora35
- .fedora_asan_addon
variables:
- CMAKE_CONFIGURATION: fedora34_asan
+ CMAKE_CONFIGURATION: fedora35_asan
### Intel Compiler
@@ -353,7 +353,7 @@
.cmake_codespell_linux:
stage: build
- extends: .fedora34
+ extends: .fedora35
script:
- codespell
interruptible: true
@@ -483,7 +483,7 @@
.cmake_org_help:
stage: build
extends:
- - .fedora34
+ - .fedora35
- .linux_builder_tags
- .cmake_org_help_artifacts
script: