diff options
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_vs2022_x64_ninja_multi.cmake | 5 | ||||
| -rwxr-xr-x | .gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 | 10 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 15 |
4 files changed, 44 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26691f9894..5258ab3a67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -843,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_windows_vs2022_x64_ninja_multi.cmake b/.gitlab/ci/configure_windows_vs2022_x64_ninja_multi.cmake new file mode 100644 index 0000000000..5b2f0b79bc --- /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_windows_vs2022_x64_ninja_multi.ps1 b/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 new file mode 100755 index 0000000000..e8d242c8fa --- /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-windows.yml b/.gitlab/os-windows.yml index be9ac6c413..d55035fb7d 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 |