summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitlab-ci.yml34
-rw-r--r--.gitlab/ci/configure_fedora33_tidy.cmake3
-rw-r--r--.gitlab/ci/configure_fedora34_common.cmake (renamed from .gitlab/ci/configure_fedora33_common.cmake)1
-rw-r--r--.gitlab/ci/configure_fedora34_makefiles.cmake (renamed from .gitlab/ci/configure_fedora33_makefiles.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora34_ninja.cmake (renamed from .gitlab/ci/configure_fedora33_ninja.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora34_ninja_multi.cmake (renamed from .gitlab/ci/configure_fedora33_ninja_multi.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora34_sphinx.cmake (renamed from .gitlab/ci/configure_fedora33_sphinx.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora34_sphinx_package.cmake (renamed from .gitlab/ci/configure_fedora33_sphinx_package.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora34_tidy.cmake3
-rw-r--r--.gitlab/ci/env_fedora34_makefiles.cmake (renamed from .gitlab/ci/env_fedora33_makefiles.cmake)0
-rw-r--r--.gitlab/os-linux.yml44
11 files changed, 44 insertions, 43 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8a22a5..1fc907d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ prep:source-package:
prep:doc-package:
extends:
- - .fedora33_sphinx_package
+ - .fedora34_sphinx_package
- .cmake_prep_doc_linux
- .linux_builder_tags_qt
- .cmake_doc_artifacts
@@ -106,16 +106,16 @@ build:debian10-iwyu:
- .linux_builder_tags
- .run_automatically
-build:fedora33-tidy:
+build:fedora34-tidy:
extends:
- - .fedora33_tidy
+ - .fedora34_tidy
- .cmake_build_linux
- .linux_builder_tags_qt
- .run_automatically
-build:fedora33-sphinx:
+build:fedora34-sphinx:
extends:
- - .fedora33_sphinx
+ - .fedora34_sphinx
- .cmake_build_linux
- .linux_builder_tags_qt
- .run_automatically
@@ -161,9 +161,9 @@ test:debian10-aarch64-ninja:
variables:
CMAKE_CI_NO_MR: "true"
-test:fedora33-makefiles:
+test:fedora34-makefiles:
extends:
- - .fedora33_makefiles
+ - .fedora34_makefiles
- .cmake_test_linux_release
- .linux_builder_tags_qt
- .run_dependent
@@ -177,36 +177,36 @@ test:cuda10.2-nvidia:
- .run_dependent
- .needs_centos6_x86_64
-build:fedora33-ninja:
+build:fedora34-ninja:
extends:
- - .fedora33_ninja
+ - .fedora34_ninja
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_builder_tags_qt
- .run_manually
-test:fedora33-ninja:
+test:fedora34-ninja:
extends:
- - .fedora33_ninja
+ - .fedora34_ninja
- .cmake_test_linux
- .linux_builder_tags_x11
- .cmake_test_artifacts
- .run_dependent
dependencies:
- - build:fedora33-ninja
+ - build:fedora34-ninja
needs:
- - build:fedora33-ninja
+ - build:fedora34-ninja
-test:fedora33-ninja-multi:
+test:fedora34-ninja-multi:
extends:
- - .fedora33_ninja_multi
+ - .fedora34_ninja_multi
- .cmake_test_linux_external
- .linux_builder_tags_qt
- .run_dependent
dependencies:
- - test:fedora33-ninja
+ - test:fedora34-ninja
needs:
- - test:fedora33-ninja
+ - test:fedora34-ninja
test:intel2016-makefiles:
extends:
diff --git a/.gitlab/ci/configure_fedora33_tidy.cmake b/.gitlab/ci/configure_fedora33_tidy.cmake
deleted file mode 100644
index 9052fdc..0000000
--- a/.gitlab/ci/configure_fedora33_tidy.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake")
diff --git a/.gitlab/ci/configure_fedora33_common.cmake b/.gitlab/ci/configure_fedora34_common.cmake
index dee78ab..4484e26 100644
--- a/.gitlab/ci/configure_fedora33_common.cmake
+++ b/.gitlab/ci/configure_fedora34_common.cmake
@@ -1,5 +1,6 @@
set(BUILD_CursesDialog ON CACHE BOOL "")
set(BUILD_QtDialog ON CACHE BOOL "")
+set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
set(CMake_TEST_JQ "/usr/bin/jq" CACHE PATH "")
set(CMake_TEST_JSON_SCHEMA ON CACHE BOOL "")
diff --git a/.gitlab/ci/configure_fedora33_makefiles.cmake b/.gitlab/ci/configure_fedora34_makefiles.cmake
index 7519d95..7519d95 100644
--- a/.gitlab/ci/configure_fedora33_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora34_makefiles.cmake
diff --git a/.gitlab/ci/configure_fedora33_ninja.cmake b/.gitlab/ci/configure_fedora34_ninja.cmake
index 883f425..37bc189 100644
--- a/.gitlab/ci/configure_fedora33_ninja.cmake
+++ b/.gitlab/ci/configure_fedora34_ninja.cmake
@@ -4,4 +4,4 @@ set(CMake_TEST_GUI "ON" CACHE BOOL "")
# Cover compilation with C++11 only and not higher standards.
set(CMAKE_CXX_STANDARD "11" CACHE STRING "")
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake")
diff --git a/.gitlab/ci/configure_fedora33_ninja_multi.cmake b/.gitlab/ci/configure_fedora34_ninja_multi.cmake
index efb4b84..efb4b84 100644
--- a/.gitlab/ci/configure_fedora33_ninja_multi.cmake
+++ b/.gitlab/ci/configure_fedora34_ninja_multi.cmake
diff --git a/.gitlab/ci/configure_fedora33_sphinx.cmake b/.gitlab/ci/configure_fedora34_sphinx.cmake
index 90d159b..90d159b 100644
--- a/.gitlab/ci/configure_fedora33_sphinx.cmake
+++ b/.gitlab/ci/configure_fedora34_sphinx.cmake
diff --git a/.gitlab/ci/configure_fedora33_sphinx_package.cmake b/.gitlab/ci/configure_fedora34_sphinx_package.cmake
index e839de8..e839de8 100644
--- a/.gitlab/ci/configure_fedora33_sphinx_package.cmake
+++ b/.gitlab/ci/configure_fedora34_sphinx_package.cmake
diff --git a/.gitlab/ci/configure_fedora34_tidy.cmake b/.gitlab/ci/configure_fedora34_tidy.cmake
new file mode 100644
index 0000000..9c79303
--- /dev/null
+++ b/.gitlab/ci/configure_fedora34_tidy.cmake
@@ -0,0 +1,3 @@
+set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake")
diff --git a/.gitlab/ci/env_fedora33_makefiles.cmake b/.gitlab/ci/env_fedora34_makefiles.cmake
index 1d0efa7..1d0efa7 100644
--- a/.gitlab/ci/env_fedora33_makefiles.cmake
+++ b/.gitlab/ci/env_fedora34_makefiles.cmake
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index d0ac85e..e914b00 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -5,7 +5,7 @@
### Release
.linux_prep_source:
- image: "fedora:33"
+ image: "fedora:34"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -68,8 +68,8 @@
### Fedora
-.fedora33:
- image: "kitware/cmake:ci-fedora33-x86_64-2021-04-06"
+.fedora34:
+ image: "kitware/cmake:ci-fedora34-x86_64-2021-05-10"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
@@ -77,28 +77,28 @@
#### Lint builds
-.fedora33_tidy:
- extends: .fedora33
+.fedora34_tidy:
+ extends: .fedora34
variables:
- CMAKE_CONFIGURATION: fedora33_tidy
+ CMAKE_CONFIGURATION: fedora34_tidy
CTEST_NO_WARNINGS_ALLOWED: 1
CMake_SKIP_INSTALL: 1
-.fedora33_sphinx:
- extends: .fedora33
+.fedora34_sphinx:
+ extends: .fedora34
variables:
- CMAKE_CONFIGURATION: fedora33_sphinx
+ CMAKE_CONFIGURATION: fedora34_sphinx
CTEST_NO_WARNINGS_ALLOWED: 1
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
CMake_SKIP_INSTALL: 1
-.fedora33_sphinx_package:
- extends: .fedora33
+.fedora34_sphinx_package:
+ extends: .fedora34
variables:
- CMAKE_CONFIGURATION: fedora33_sphinx_package
+ CMAKE_CONFIGURATION: fedora34_sphinx_package
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
#### Build and test
@@ -117,26 +117,26 @@
CMAKE_CONFIGURATION: debian10_aarch64_ninja
CTEST_NO_WARNINGS_ALLOWED: 1
-.fedora33_ninja:
- extends: .fedora33
+.fedora34_ninja:
+ extends: .fedora34
variables:
- CMAKE_CONFIGURATION: fedora33_ninja
+ CMAKE_CONFIGURATION: fedora34_ninja
CTEST_NO_WARNINGS_ALLOWED: 1
-.fedora33_ninja_multi:
- extends: .fedora33
+.fedora34_ninja_multi:
+ extends: .fedora34
variables:
- CMAKE_CONFIGURATION: fedora33_ninja_multi
+ CMAKE_CONFIGURATION: fedora34_ninja_multi
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Ninja Multi-Config"
-.fedora33_makefiles:
- extends: .fedora33
+.fedora34_makefiles:
+ extends: .fedora34
variables:
- CMAKE_CONFIGURATION: fedora33_makefiles
+ CMAKE_CONFIGURATION: fedora34_makefiles
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Unix Makefiles"
@@ -374,7 +374,7 @@
.cmake_org_help:
stage: build
extends:
- - .fedora33
+ - .fedora34
- .linux_builder_tags
- .cmake_org_help_artifacts
script:
generated by cgit v0.12 at 2025-01-02 17:58:14 (GMT)