summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2020-06-12 13:53:19 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2020-06-12 15:23:36 (GMT)
commit77b44ed4bab41d10b975a273b267210037318265 (patch)
tree20a9582f23ada21a866596ef6c90097e8a05daf1
parentd33b38d4aab6ca719141067c8538b09b95200900 (diff)
downloadCMake-77b44ed4bab41d10b975a273b267210037318265.zip
CMake-77b44ed4bab41d10b975a273b267210037318265.tar.gz
CMake-77b44ed4bab41d10b975a273b267210037318265.tar.bz2
gitlab-ci: add an Xcode tester
-rw-r--r--.gitlab-ci.yml33
-rw-r--r--.gitlab/ci/configure_macos_common.cmake2
-rw-r--r--.gitlab/ci/configure_macos_makefiles.cmake1
-rw-r--r--.gitlab/ci/configure_macos_ninja.cmake1
-rw-r--r--.gitlab/ci/configure_macos_xcode.cmake2
5 files changed, 37 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b821fba..438510c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/.gitlab/ci/configure_macos_common.cmake b/.gitlab/ci/configure_macos_common.cmake
index 3589475..bd5902b 100644
--- a/.gitlab/ci/configure_macos_common.cmake
+++ b/.gitlab/ci/configure_macos_common.cmake
@@ -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")
diff --git a/.gitlab/ci/configure_macos_makefiles.cmake b/.gitlab/ci/configure_macos_makefiles.cmake
index 0f4f194..85f67b5 100644
--- a/.gitlab/ci/configure_macos_makefiles.cmake
+++ b/.gitlab/ci/configure_macos_makefiles.cmake
@@ -1 +1,2 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
diff --git a/.gitlab/ci/configure_macos_ninja.cmake b/.gitlab/ci/configure_macos_ninja.cmake
index 0f4f194..85f67b5 100644
--- a/.gitlab/ci/configure_macos_ninja.cmake
+++ b/.gitlab/ci/configure_macos_ninja.cmake
@@ -1 +1,2 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
diff --git a/.gitlab/ci/configure_macos_xcode.cmake b/.gitlab/ci/configure_macos_xcode.cmake
new file mode 100644
index 0000000..1b976d2
--- /dev/null
+++ b/.gitlab/ci/configure_macos_xcode.cmake
@@ -0,0 +1,2 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")