diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-12 09:53:19 -0400 |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-12 11:23:36 -0400 |
| commit | 77b44ed4bab41d10b975a273b267210037318265 (patch) | |
| tree | 20a9582f23ada21a866596ef6c90097e8a05daf1 | |
| parent | d33b38d4aab6ca719141067c8538b09b95200900 (diff) | |
| download | cmake-77b44ed4bab41d10b975a273b267210037318265.tar.gz | |
gitlab-ci: add an Xcode tester
| -rw-r--r-- | .gitlab-ci.yml | 33 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_common.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_makefiles.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_ninja.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_xcode.cmake | 2 |
5 files changed, 37 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b821fba314..438510c959 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 3589475008..bd5902b08b 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 0f4f194c27..85f67b5314 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 0f4f194c27..85f67b5314 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 0000000000..1b976d261a --- /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") |