gitlab-ci: also build ncurses and Qt code on Linux
This commit is contained in:
parent
95721f0a82
commit
1e8ecfccdd
@ -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:
|
||||
|
4
.gitlab/ci/configure_fedora31_common.cmake
Normal file
4
.gitlab/ci/configure_fedora31_common.cmake
Normal file
@ -0,0 +1,4 @@
|
||||
set(BUILD_CursesDialog ON CACHE BOOL "")
|
||||
set(BUILD_QtDialog ON CACHE BOOL "")
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
|
@ -1 +1 @@
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake")
|
||||
|
@ -1 +1 @@
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake")
|
||||
|
@ -1,3 +1,3 @@
|
||||
set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake")
|
||||
|
Loading…
Reference in New Issue
Block a user