Merge topic 'ci-nmc'

3ed06404bf gitlab-ci: add nightly job testing Ninja Multi-Config on Windows
e39acc2b3a gitlab-ci: add nightly job testing Ninja Multi-Config on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7337

7 files changed, 75 insertions, 0 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78b2fbe..5258ab3 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
@@ -829,6 +843,20 @@ t:windows-vs2022-x64-ninja:
     variables:
         CMAKE_CI_JOB_NIGHTLY_NINJA: "true"
 
+t:windows-vs2022-x64-ninja-multi:
+    extends:
+        - .windows_vs2022_x64_ninja_multi
+        - .cmake_test_windows_external
+        - .windows_tags_concurrent_vs2022
+        - .cmake_junit_artifacts
+        - .run_dependent
+    dependencies:
+        - t:windows-vs2022-x64-ninja
+    needs:
+        - t:windows-vs2022-x64-ninja
+    variables:
+        CMAKE_CI_JOB_NIGHTLY: "true"
+
 t:windows-vs2022-x64:
     extends:
         - .windows_vs2022_x64
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/configure_windows_vs2022_x64_ninja_multi.cmake b/.gitlab/ci/configure_windows_vs2022_x64_ninja_multi.cmake
new file mode 100644
index 0000000..5b2f0b7
--- /dev/null
+++ b/.gitlab/ci/configure_windows_vs2022_x64_ninja_multi.cmake
@@ -0,0 +1,5 @@
+if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "")
+  set(CMake_TEST_ISPC "ON" CACHE STRING "")
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_msvc_common.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/ci/env_windows_vs2022_x64_ninja_multi.ps1 b/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1
new file mode 100755
index 0000000..e8d242c
--- /dev/null
+++ b/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1
@@ -0,0 +1,10 @@
+if ("$env:CMAKE_CI_NIGHTLY" -eq "true") {
+  Invoke-Expression -Command ".gitlab/ci/ispc-env.ps1"
+}
+
+$pwdpath = $pwd.Path
+powershell -File ".gitlab/ci/ninja.ps1"
+Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab;$env:PATH"
+ninja --version
+
+Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1
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:
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index be9ac6c..d55035f 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -125,6 +125,13 @@
         CMAKE_CI_BUILD_TYPE: Release
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
+.windows_ninja_multi:
+    extends: .windows
+
+    variables:
+        CMAKE_GENERATOR: "Ninja Multi-Config"
+        CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
+
 .windows_nmake:
     extends: .windows
 
@@ -157,6 +164,14 @@
     variables:
         CMAKE_CONFIGURATION: windows_vs2022_x64_jom
 
+.windows_vs2022_x64_ninja_multi:
+    extends:
+        - .windows_ninja_multi
+        - .windows_vcvarsall_vs2022_x64
+
+    variables:
+        CMAKE_CONFIGURATION: windows_vs2022_x64_ninja_multi
+
 .windows_clang_ninja:
     extends:
         - .windows_ninja