diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-06 21:58:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-06-07 16:21:02 (GMT) |
| commit | e39acc2b3a5a793803d80ddce4c4b965e8d3f79f (patch) | |
| tree | 861c0a5c92d15a9e252072e253bab1b8f66f11ff | |
| parent | 031fa14b7eab1e85882eb5a9e10cb8f7f66c1350 (diff) | |
| download | CMake-e39acc2b3a5a793803d80ddce4c4b965e8d3f79f.zip CMake-e39acc2b3a5a793803d80ddce4c4b965e8d3f79f.tar.gz CMake-e39acc2b3a5a793803d80ddce4c4b965e8d3f79f.tar.bz2 | |
gitlab-ci: add nightly job testing Ninja Multi-Config on macOS
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_x86_64_ninja_multi.cmake | 6 | ||||
| -rw-r--r-- | .gitlab/ci/env_macos_x86_64_ninja_multi.sh | 3 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 8 |
4 files changed, 31 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78b2fbe..26691f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -733,6 +733,20 @@ t:macos-x86_64-makefiles: needs: - b:macos-x86_64-makefiles +t:macos-x86_64-ninja-multi: + extends: + - .macos_x86_64_ninja_multi + - .cmake_test_macos_external + - .macos_x86_64_builder_ext_tags + - .cmake_junit_artifacts + - .run_dependent + dependencies: + - t:macos-x86_64-ninja + needs: + - t:macos-x86_64-ninja + variables: + CMAKE_CI_JOB_NIGHTLY: "true" + t:macos-x86_64-xcode: extends: - .macos_x86_64_xcode diff --git a/.gitlab/ci/configure_macos_x86_64_ninja_multi.cmake b/.gitlab/ci/configure_macos_x86_64_ninja_multi.cmake new file mode 100644 index 0000000..b22285c --- /dev/null +++ b/.gitlab/ci/configure_macos_x86_64_ninja_multi.cmake @@ -0,0 +1,6 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/env_macos_x86_64_ninja_multi.sh b/.gitlab/ci/env_macos_x86_64_ninja_multi.sh new file mode 100644 index 0000000..217ff30 --- /dev/null +++ b/.gitlab/ci/env_macos_x86_64_ninja_multi.sh @@ -0,0 +1,3 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index da4757a..3183bf7 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -80,6 +80,14 @@ CMAKE_GENERATOR: Xcode CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" +.macos_x86_64_ninja_multi: + extends: .macos + + variables: + CMAKE_CONFIGURATION: macos_x86_64_ninja_multi + CMAKE_GENERATOR: "Ninja Multi-Config" + CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" + ## Tags .macos_x86_64_builder_tags: |