summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitlab-ci.yml56
-rw-r--r--.gitlab/ci/configure_fedora35_clang_analyzer.cmake1
-rw-r--r--.gitlab/ci/configure_fedora35_tidy.cmake3
-rw-r--r--.gitlab/ci/configure_fedora36_asan.cmake (renamed from .gitlab/ci/configure_fedora35_asan.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora36_clang_analyzer.cmake1
-rw-r--r--.gitlab/ci/configure_fedora36_common.cmake (renamed from .gitlab/ci/configure_fedora35_common.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora36_makefiles.cmake (renamed from .gitlab/ci/configure_fedora35_makefiles.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora36_ninja.cmake (renamed from .gitlab/ci/configure_fedora35_ninja.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora36_ninja_multi.cmake (renamed from .gitlab/ci/configure_fedora35_ninja_multi.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora36_sphinx.cmake (renamed from .gitlab/ci/configure_fedora35_sphinx.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora36_sphinx_package.cmake (renamed from .gitlab/ci/configure_fedora35_sphinx_package.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora36_tidy.cmake3
-rw-r--r--.gitlab/ci/ctest_memcheck_fedora36_asan.lsan.supp (renamed from .gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp)0
-rw-r--r--.gitlab/ci/env_fedora35_makefiles.cmake2
-rw-r--r--.gitlab/ci/env_fedora36_asan.sh (renamed from .gitlab/ci/env_fedora35_asan.sh)0
-rw-r--r--.gitlab/ci/env_fedora36_clang_analyzer.sh (renamed from .gitlab/ci/env_fedora35_clang_analyzer.sh)0
-rw-r--r--.gitlab/ci/env_fedora36_makefiles.cmake2
-rw-r--r--.gitlab/os-linux.yml58
-rw-r--r--.gitlab/upload.yml4
19 files changed, 67 insertions, 67 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7917803..47b8738 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,7 @@ p:source-package:
p:doc-package:
extends:
- - .fedora35_sphinx_package
+ - .fedora36_sphinx_package
- .cmake_prep_doc_linux
- .linux_builder_tags_qt
- .cmake_doc_artifacts
@@ -101,16 +101,16 @@ l:iwyu-debian10:
- .linux_builder_tags
- .run_automatically
-l:tidy-fedora35:
+l:tidy-fedora36:
extends:
- - .fedora35_tidy
+ - .fedora36_tidy
- .cmake_build_linux
- .linux_builder_tags_qt
- .run_automatically
-l:sphinx-fedora35:
+l:sphinx-fedora36:
extends:
- - .fedora35_sphinx
+ - .fedora36_sphinx
- .cmake_build_linux
- .linux_builder_tags_qt
- .run_automatically
@@ -118,9 +118,9 @@ l:sphinx-fedora35:
CMAKE_CI_JOB_CONTINUOUS: "true"
CMAKE_CI_JOB_HELP: "true"
-l:clang-analyzer-fedora35:
+l:clang-analyzer-fedora36:
extends:
- - .fedora35_clang_analyzer
+ - .fedora36_clang_analyzer
- .cmake_build_linux
- .linux_builder_tags_qt
- .run_automatically
@@ -189,17 +189,17 @@ t:debian10-makefiles-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
-t:fedora35-makefiles:
+t:fedora36-makefiles:
extends:
- - .fedora35_makefiles
+ - .fedora36_makefiles
- .cmake_test_linux_release
- .linux_builder_tags_qt
- .run_dependent
- .needs_centos6_x86_64
-t:fedora35-makefiles-nospace:
+t:fedora36-makefiles-nospace:
extends:
- - .fedora35_makefiles
+ - .fedora36_makefiles
- .cmake_test_linux_release
- .linux_builder_tags_qt
- .cmake_junit_artifacts
@@ -207,7 +207,7 @@ t:fedora35-makefiles-nospace:
- .needs_centos6_x86_64
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
- CMAKE_CI_BUILD_NAME: fedora35_makefiles_nospace
+ CMAKE_CI_BUILD_NAME: fedora36_makefiles_nospace
CMAKE_CI_JOB_NIGHTLY: "true"
t:cuda9.2-nvidia:
@@ -268,9 +268,9 @@ t:hip4.2-radeon:
variables:
CMAKE_CI_NO_MR: "true"
-b:fedora35-ninja:
+b:fedora36-ninja:
extends:
- - .fedora35_ninja
+ - .fedora36_ninja
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_builder_tags_qt
@@ -287,31 +287,31 @@ b:debian10-makefiles-inplace:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
-t:fedora35-ninja:
+t:fedora36-ninja:
extends:
- - .fedora35_ninja
+ - .fedora36_ninja
- .cmake_test_linux
- .linux_builder_tags_x11
- .cmake_test_artifacts
- .run_dependent
dependencies:
- - b:fedora35-ninja
+ - b:fedora36-ninja
needs:
- - b:fedora35-ninja
+ - b:fedora36-ninja
variables:
CMAKE_CI_JOB_CONTINUOUS: "true"
-t:fedora35-ninja-multi:
+t:fedora36-ninja-multi:
extends:
- - .fedora35_ninja_multi
+ - .fedora36_ninja_multi
- .cmake_test_linux_external
- .linux_builder_tags_qt
- .cmake_junit_artifacts
- .run_dependent
dependencies:
- - t:fedora35-ninja
+ - t:fedora36-ninja
needs:
- - t:fedora35-ninja
+ - t:fedora36-ninja
t:intel2016-makefiles:
extends:
@@ -632,9 +632,9 @@ u:linux-aarch64-package:
## Sanitizer builds
-b:fedora35-asan:
+b:fedora36-asan:
extends:
- - .fedora35_asan
+ - .fedora36_asan
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_builder_tags_qt
@@ -642,16 +642,16 @@ b:fedora35-asan:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
-t:fedora35-asan:
+t:fedora36-asan:
extends:
- - .fedora35_asan
+ - .fedora36_asan
- .cmake_memcheck_linux
- .linux_builder_tags_qt
- .run_dependent
dependencies:
- - b:fedora35-asan
+ - b:fedora36-asan
needs:
- - b:fedora35-asan
+ - b:fedora36-asan
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
diff --git a/.gitlab/ci/configure_fedora35_clang_analyzer.cmake b/.gitlab/ci/configure_fedora35_clang_analyzer.cmake
deleted file mode 100644
index 761a323..0000000
--- a/.gitlab/ci/configure_fedora35_clang_analyzer.cmake
+++ /dev/null
@@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake")
diff --git a/.gitlab/ci/configure_fedora35_tidy.cmake b/.gitlab/ci/configure_fedora35_tidy.cmake
deleted file mode 100644
index 752d241..0000000
--- a/.gitlab/ci/configure_fedora35_tidy.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake")
diff --git a/.gitlab/ci/configure_fedora35_asan.cmake b/.gitlab/ci/configure_fedora36_asan.cmake
index 84fefad..51977d9 100644
--- a/.gitlab/ci/configure_fedora35_asan.cmake
+++ b/.gitlab/ci/configure_fedora36_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_fedora35_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora36_common.cmake")
diff --git a/.gitlab/ci/configure_fedora36_clang_analyzer.cmake b/.gitlab/ci/configure_fedora36_clang_analyzer.cmake
new file mode 100644
index 0000000..456936b
--- /dev/null
+++ b/.gitlab/ci/configure_fedora36_clang_analyzer.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora36_common.cmake")
diff --git a/.gitlab/ci/configure_fedora35_common.cmake b/.gitlab/ci/configure_fedora36_common.cmake
index 4484e26..4484e26 100644
--- a/.gitlab/ci/configure_fedora35_common.cmake
+++ b/.gitlab/ci/configure_fedora36_common.cmake
diff --git a/.gitlab/ci/configure_fedora35_makefiles.cmake b/.gitlab/ci/configure_fedora36_makefiles.cmake
index 9dc5ca9..9dc5ca9 100644
--- a/.gitlab/ci/configure_fedora35_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora36_makefiles.cmake
diff --git a/.gitlab/ci/configure_fedora35_ninja.cmake b/.gitlab/ci/configure_fedora36_ninja.cmake
index e6143b7..7e33513 100644
--- a/.gitlab/ci/configure_fedora35_ninja.cmake
+++ b/.gitlab/ci/configure_fedora36_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_fedora35_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora36_common.cmake")
diff --git a/.gitlab/ci/configure_fedora35_ninja_multi.cmake b/.gitlab/ci/configure_fedora36_ninja_multi.cmake
index efb4b84..efb4b84 100644
--- a/.gitlab/ci/configure_fedora35_ninja_multi.cmake
+++ b/.gitlab/ci/configure_fedora36_ninja_multi.cmake
diff --git a/.gitlab/ci/configure_fedora35_sphinx.cmake b/.gitlab/ci/configure_fedora36_sphinx.cmake
index 90d159b..90d159b 100644
--- a/.gitlab/ci/configure_fedora35_sphinx.cmake
+++ b/.gitlab/ci/configure_fedora36_sphinx.cmake
diff --git a/.gitlab/ci/configure_fedora35_sphinx_package.cmake b/.gitlab/ci/configure_fedora36_sphinx_package.cmake
index e839de8..e839de8 100644
--- a/.gitlab/ci/configure_fedora35_sphinx_package.cmake
+++ b/.gitlab/ci/configure_fedora36_sphinx_package.cmake
diff --git a/.gitlab/ci/configure_fedora36_tidy.cmake b/.gitlab/ci/configure_fedora36_tidy.cmake
new file mode 100644
index 0000000..38414d3
--- /dev/null
+++ b/.gitlab/ci/configure_fedora36_tidy.cmake
@@ -0,0 +1,3 @@
+set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora36_common.cmake")
diff --git a/.gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora36_asan.lsan.supp
index 8ec1a03..8ec1a03 100644
--- a/.gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp
+++ b/.gitlab/ci/ctest_memcheck_fedora36_asan.lsan.supp
diff --git a/.gitlab/ci/env_fedora35_makefiles.cmake b/.gitlab/ci/env_fedora35_makefiles.cmake
deleted file mode 100644
index aa84e23..0000000
--- a/.gitlab/ci/env_fedora35_makefiles.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-2.7.0")
-set(ENV{PATH} "/usr/lib64/mpich/bin:$ENV{PATH}")
diff --git a/.gitlab/ci/env_fedora35_asan.sh b/.gitlab/ci/env_fedora36_asan.sh
index e976486..e976486 100644
--- a/.gitlab/ci/env_fedora35_asan.sh
+++ b/.gitlab/ci/env_fedora36_asan.sh
diff --git a/.gitlab/ci/env_fedora35_clang_analyzer.sh b/.gitlab/ci/env_fedora36_clang_analyzer.sh
index d732c0b..d732c0b 100644
--- a/.gitlab/ci/env_fedora35_clang_analyzer.sh
+++ b/.gitlab/ci/env_fedora36_clang_analyzer.sh
diff --git a/.gitlab/ci/env_fedora36_makefiles.cmake b/.gitlab/ci/env_fedora36_makefiles.cmake
new file mode 100644
index 0000000..2bcb6d0
--- /dev/null
+++ b/.gitlab/ci/env_fedora36_makefiles.cmake
@@ -0,0 +1,2 @@
+set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-3.0.4")
+set(ENV{PATH} "/usr/lib64/mpich/bin:$ENV{PATH}")
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index f9af14f..a822d94 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -5,7 +5,7 @@
### Release
.linux_prep_source:
- image: "fedora:35"
+ image: "fedora:36"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -68,8 +68,8 @@
### Fedora
-.fedora35:
- image: "kitware/cmake:ci-fedora35-x86_64-2022-04-22"
+.fedora36:
+ image: "kitware/cmake:ci-fedora36-x86_64-2022-05-17"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
@@ -77,37 +77,37 @@
#### Lint builds
-.fedora35_tidy:
- extends: .fedora35
+.fedora36_tidy:
+ extends: .fedora36
variables:
- CMAKE_CONFIGURATION: fedora35_tidy
+ CMAKE_CONFIGURATION: fedora36_tidy
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_CI_NO_INSTALL: 1
-.fedora35_clang_analyzer:
- extends: .fedora35
+.fedora36_clang_analyzer:
+ extends: .fedora36
variables:
- CMAKE_CONFIGURATION: fedora35_clang_analyzer
+ CMAKE_CONFIGURATION: fedora36_clang_analyzer
CMAKE_CI_BUILD_TYPE: Debug
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_CI_NO_INSTALL: 1
-.fedora35_sphinx:
- extends: .fedora35
+.fedora36_sphinx:
+ extends: .fedora36
variables:
- CMAKE_CONFIGURATION: fedora35_sphinx
+ CMAKE_CONFIGURATION: fedora36_sphinx
CTEST_NO_WARNINGS_ALLOWED: 1
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
CMAKE_CI_NO_INSTALL: 1
-.fedora35_sphinx_package:
- extends: .fedora35
+.fedora36_sphinx_package:
+ extends: .fedora36
variables:
- CMAKE_CONFIGURATION: fedora35_sphinx_package
+ CMAKE_CONFIGURATION: fedora36_sphinx_package
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
#### Build and test
@@ -137,27 +137,27 @@
CMAKE_CI_NO_INSTALL: 1
CTEST_NO_WARNINGS_ALLOWED: 1
-.fedora35_ninja:
- extends: .fedora35
+.fedora36_ninja:
+ extends: .fedora36
variables:
- CMAKE_CONFIGURATION: fedora35_ninja
+ CMAKE_CONFIGURATION: fedora36_ninja
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
-.fedora35_ninja_multi:
- extends: .fedora35
+.fedora36_ninja_multi:
+ extends: .fedora36
variables:
- CMAKE_CONFIGURATION: fedora35_ninja_multi
+ CMAKE_CONFIGURATION: fedora36_ninja_multi
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Ninja Multi-Config"
-.fedora35_makefiles:
- extends: .fedora35
+.fedora36_makefiles:
+ extends: .fedora36
variables:
- CMAKE_CONFIGURATION: fedora35_makefiles
+ CMAKE_CONFIGURATION: fedora36_makefiles
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Unix Makefiles"
@@ -189,13 +189,13 @@
CTEST_MEMORYCHECK_TYPE: AddressSanitizer
CTEST_MEMORYCHECK_SANITIZER_OPTIONS: ""
-.fedora35_asan:
+.fedora36_asan:
extends:
- - .fedora35
+ - .fedora36
- .fedora_asan_addon
variables:
- CMAKE_CONFIGURATION: fedora35_asan
+ CMAKE_CONFIGURATION: fedora36_asan
### Intel Compiler
@@ -389,7 +389,7 @@
.cmake_codespell_linux:
stage: build
- extends: .fedora35
+ extends: .fedora36
script:
- codespell
interruptible: true
@@ -532,7 +532,7 @@
.cmake_org_help:
stage: build
extends:
- - .fedora35
+ - .fedora36
- .linux_builder_tags
- .cmake_org_help_artifacts
script:
diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml
index d831c3e..38d40a9 100644
--- a/.gitlab/upload.yml
+++ b/.gitlab/upload.yml
@@ -1,7 +1,7 @@
# Steps for uploading artifacts
.rsync_upload_package:
- image: "fedora:35"
+ image: "fedora:36"
stage: upload
tags:
- cmake
@@ -21,7 +21,7 @@
.rsync_upload_help:
stage: upload
- image: "fedora:35"
+ image: "fedora:36"
tags:
- cmake
- docker
generated by cgit v0.12 at 2025-01-12 10:06:54 (GMT)