mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-05 05:11:15 -06:00
gitlab-ci: update Linux CI to use Fedora 33
This commit is contained in:
@@ -46,7 +46,7 @@ prep:source-package:
|
||||
|
||||
prep:doc-package:
|
||||
extends:
|
||||
- .fedora31_sphinx_package
|
||||
- .fedora33_sphinx_package
|
||||
- .cmake_prep_doc_linux
|
||||
- .linux_builder_tags_qt
|
||||
- .cmake_doc_artifacts
|
||||
@@ -72,16 +72,16 @@ build:debian10-iwyu:
|
||||
- .linux_builder_tags
|
||||
- .run_automatically
|
||||
|
||||
build:fedora31-tidy:
|
||||
build:fedora33-tidy:
|
||||
extends:
|
||||
- .fedora31_tidy
|
||||
- .fedora33_tidy
|
||||
- .cmake_build_linux
|
||||
- .linux_builder_tags_qt
|
||||
- .run_automatically
|
||||
|
||||
build:fedora31-sphinx:
|
||||
build:fedora33-sphinx:
|
||||
extends:
|
||||
- .fedora31_sphinx
|
||||
- .fedora33_sphinx
|
||||
- .cmake_build_linux
|
||||
- .linux_builder_tags_qt
|
||||
- .run_automatically
|
||||
@@ -110,9 +110,9 @@ test:debian10-ninja:
|
||||
needs:
|
||||
- build:centos6-release
|
||||
|
||||
test:fedora31-makefiles:
|
||||
test:fedora33-makefiles:
|
||||
extends:
|
||||
- .fedora31_makefiles
|
||||
- .fedora33_makefiles
|
||||
- .cmake_test_linux_package
|
||||
- .linux_builder_tags_qt
|
||||
- .run_dependent
|
||||
@@ -132,36 +132,36 @@ test:cuda10.2-nvidia:
|
||||
needs:
|
||||
- build:centos6-release
|
||||
|
||||
build:fedora31-ninja:
|
||||
build:fedora33-ninja:
|
||||
extends:
|
||||
- .fedora31_ninja
|
||||
- .fedora33_ninja
|
||||
- .cmake_build_linux
|
||||
- .cmake_build_artifacts
|
||||
- .linux_builder_tags_qt
|
||||
- .run_manually
|
||||
|
||||
test:fedora31-ninja:
|
||||
test:fedora33-ninja:
|
||||
extends:
|
||||
- .fedora31_ninja
|
||||
- .fedora33_ninja
|
||||
- .cmake_test_linux
|
||||
- .linux_builder_tags_x11
|
||||
- .cmake_test_artifacts
|
||||
- .run_dependent
|
||||
dependencies:
|
||||
- build:fedora31-ninja
|
||||
- build:fedora33-ninja
|
||||
needs:
|
||||
- build:fedora31-ninja
|
||||
- build:fedora33-ninja
|
||||
|
||||
test:fedora31-ninja-multi:
|
||||
test:fedora33-ninja-multi:
|
||||
extends:
|
||||
- .fedora31_ninja_multi
|
||||
- .fedora33_ninja_multi
|
||||
- .cmake_test_linux_external
|
||||
- .linux_builder_tags_qt
|
||||
- .run_dependent
|
||||
dependencies:
|
||||
- test:fedora31-ninja
|
||||
- test:fedora33-ninja
|
||||
needs:
|
||||
- test:fedora31-ninja
|
||||
- test:fedora33-ninja
|
||||
|
||||
build:linux-x86_64-package:
|
||||
extends:
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.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_fedora31_common.cmake")
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake")
|
||||
3
.gitlab/ci/configure_fedora33_tidy.cmake
Normal file
3
.gitlab/ci/configure_fedora33_tidy.cmake
Normal file
@@ -0,0 +1,3 @@
|
||||
set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake")
|
||||
@@ -48,36 +48,36 @@
|
||||
|
||||
### Fedora
|
||||
|
||||
.fedora31:
|
||||
image: "kitware/cmake:ci-fedora31-x86_64-2020-10-22"
|
||||
.fedora33:
|
||||
image: "kitware/cmake:ci-fedora33-x86_64-2020-11-13"
|
||||
|
||||
variables:
|
||||
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
|
||||
|
||||
#### Lint builds
|
||||
|
||||
.fedora31_tidy:
|
||||
extends: .fedora31
|
||||
.fedora33_tidy:
|
||||
extends: .fedora33
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora31_tidy
|
||||
CMAKE_CONFIGURATION: fedora33_tidy
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
CMake_SKIP_INSTALL: 1
|
||||
|
||||
.fedora31_sphinx:
|
||||
extends: .fedora31
|
||||
.fedora33_sphinx:
|
||||
extends: .fedora33
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora31_sphinx
|
||||
CMAKE_CONFIGURATION: fedora33_sphinx
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
|
||||
CMake_SKIP_INSTALL: 1
|
||||
|
||||
.fedora31_sphinx_package:
|
||||
extends: .fedora31
|
||||
.fedora33_sphinx_package:
|
||||
extends: .fedora33
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora31_sphinx_package
|
||||
CMAKE_CONFIGURATION: fedora33_sphinx_package
|
||||
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
|
||||
|
||||
#### Build and test
|
||||
@@ -89,26 +89,26 @@
|
||||
CMAKE_CONFIGURATION: debian10_ninja
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
|
||||
.fedora31_ninja:
|
||||
extends: .fedora31
|
||||
.fedora33_ninja:
|
||||
extends: .fedora33
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora31_ninja
|
||||
CMAKE_CONFIGURATION: fedora33_ninja
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
|
||||
.fedora31_ninja_multi:
|
||||
extends: .fedora31
|
||||
.fedora33_ninja_multi:
|
||||
extends: .fedora33
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora31_ninja_multi
|
||||
CMAKE_CONFIGURATION: fedora33_ninja_multi
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
CMAKE_GENERATOR: "Ninja Multi-Config"
|
||||
|
||||
.fedora31_makefiles:
|
||||
extends: .fedora31
|
||||
.fedora33_makefiles:
|
||||
extends: .fedora33
|
||||
|
||||
variables:
|
||||
CMAKE_CONFIGURATION: fedora31_makefiles
|
||||
CMAKE_CONFIGURATION: fedora33_makefiles
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
CMAKE_GENERATOR: "Unix Makefiles"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user