diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-11-13 09:46:40 -0500 |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-11-13 09:46:40 -0500 |
| commit | 3d1183c457bc023a999a2140a93701c503e1ddc4 (patch) | |
| tree | da91b28b158fc45b4c031d14356a6a5dee5e81b5 /.gitlab-ci.yml | |
| parent | 9279d1fc0b031bb22fbb2234e5d083157f2764fc (diff) | |
| parent | 6e35919e15b350c771afe8e9dc2a510dc4300e02 (diff) | |
| download | cmake-3d1183c457bc023a999a2140a93701c503e1ddc4.tar.gz | |
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-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a94a3d19b..626071a512 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: |