Skip to content
Snippets Groups Projects
Commit 77b44ed4 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

gitlab-ci: add an Xcode tester

parent d33b38d4
No related branches found
No related tags found
No related merge requests found
......@@ -127,6 +127,13 @@
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Unix Makefiles"
.macos_xcode: &macos_xcode
extends: .macos
variables:
CMAKE_CONFIGURATION: macos_xcode
CMAKE_GENERATOR: Xcode
.windows: &windows
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR\\cmake ci ext\\$CI_CONCURRENT_ID"
......@@ -433,6 +440,20 @@
interruptible: true
.cmake_test_macos_external: &cmake_test_macos_external
stage: test-ext
script:
- *before_script_unix
- .gitlab/ci/sccache.sh
# Allow the server to already be running.
- "sccache --start-server || :"
- sccache --show-stats
- "$LAUNCHER build/install/CMake.app/Contents/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake"
- sccache --show-stats
interruptible: true
.cmake_test_windows_external: &cmake_test_windows_external
stage: test-ext
......@@ -540,6 +561,7 @@ test:macos-ninja:
<<:
- *macos_ninja
- *cmake_test_unix
- *cmake_test_artifacts
- *macos_builder_tags
rules: *rules_settings
dependencies:
......@@ -566,6 +588,17 @@ test:macos-makefiles:
needs:
- build:macos-makefiles
test:macos-xcode:
<<:
- *macos_xcode
- *cmake_test_macos_external
- *macos_builder_ext_tags
rules: *rules_settings
dependencies:
- test:macos-ninja
needs:
- test:macos-ninja
build:windows-vs2019-x64-ninja:
<<:
- *windows_vs2019_x64_ninja
......
......@@ -7,5 +7,3 @@ set(Java_JAVAC_EXECUTABLE "" CACHE FILEPATH "")
set(Java_JAR_EXECUTABLE "" CACHE FILEPATH "")
set(BUILD_QtDialog ON CACHE BOOL "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment