diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-11-13 14:46:40 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-11-13 14:46:40 (GMT) |
| commit | 3d1183c457bc023a999a2140a93701c503e1ddc4 (patch) | |
| tree | da91b28b158fc45b4c031d14356a6a5dee5e81b5 /.gitlab/os-linux.yml | |
| parent | 9279d1fc0b031bb22fbb2234e5d083157f2764fc (diff) | |
| parent | 6e35919e15b350c771afe8e9dc2a510dc4300e02 (diff) | |
| download | CMake-3d1183c457bc023a999a2140a93701c503e1ddc4.zip CMake-3d1183c457bc023a999a2140a93701c503e1ddc4.tar.gz CMake-3d1183c457bc023a999a2140a93701c503e1ddc4.tar.bz2 | |
Merge branch 'ci-fedora33-release' into ci-fedora33
* ci-fedora33-release:
gitlab-ci: use Fedora 33 to build sources
gitlab-ci: update Linux CI to use Fedora 33
ci: update to Fedora 33 for Linux builds
ci: install gmock in the Fedora 31 image
Tests/FindBoost/TestPython: support finding 3.8 and 3.9
clang-tidy: ignore new warnings from newer versions
clang-tidy: ignore `misc-no-recursion`
Diffstat (limited to '.gitlab/os-linux.yml')
| -rw-r--r-- | .gitlab/os-linux.yml | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index bab4f5a..6684d71 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -12,7 +12,7 @@ LAUNCHER: "scl enable devtoolset-6 rh-python36 --" .linux_prep_source: - image: "fedora:32" + image: "fedora:33" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -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/long file name for testing purposes" #### 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" |