Browse Source

gitlab-ci: add nightly job testing Ninja Multi-Config on macOS

Brad King 3 years ago
parent
commit
e39acc2b3a

+ 14 - 0
.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

+ 6 - 0
.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")

+ 3 - 0
.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

+ 8 - 0
.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: