summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2020-06-01 10:51:58 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2020-06-02 11:37:56 (GMT)
commit1e8ecfccdd6faf5c46e933cf21209bb5885694a2 (patch)
treec1ef6739ad048acb80eed2a58c76e71a4147d910 /.gitlab-ci.yml
parent95721f0a822e85e962ccb49a57de5bd4ca7baddd (diff)
downloadCMake-1e8ecfccdd6faf5c46e933cf21209bb5885694a2.zip
CMake-1e8ecfccdd6faf5c46e933cf21209bb5885694a2.tar.gz
CMake-1e8ecfccdd6faf5c46e933cf21209bb5885694a2.tar.bz2
gitlab-ci: also build ncurses and Qt code on Linux
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7440f2..0a7c98a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@
- when: never
.fedora31: &fedora31
- image: "kitware/cmake:ci-fedora31-x86_64-2020-05-08"
+ image: "kitware/cmake:ci-fedora31-x86_64-2020-06-01"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -321,7 +321,7 @@ build:fedora31-tidy:
<<:
- *fedora31_tidy
- *cmake_build_unix
- - *linux_builder_tags
+ - *linux_builder_tags_qt
rules: *rules_settings
build:fedora31-sphinx:
@@ -336,7 +336,7 @@ build:fedora31-ninja:
- *fedora31_ninja
- *cmake_build_unix
- *cmake_build_artifacts
- - *linux_builder_tags
+ - *linux_builder_tags_qt
rules: *manual_rules_settings
test:fedora31-ninja:
@@ -355,7 +355,7 @@ build:fedora31-makefiles:
- *fedora31_makefiles
- *cmake_build_unix
- *cmake_build_artifacts
- - *linux_builder_tags
+ - *linux_builder_tags_qt
rules: *manual_rules_settings
test:fedora31-makefiles: