diff options
Diffstat (limited to '.gitlab/os-windows.yml')
| -rw-r--r-- | .gitlab/os-windows.yml | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 5471683..e15bbe9 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -95,6 +95,14 @@ CMAKE_CI_BUILD_TYPE: Release CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" +.windows_jom: + extends: .windows + + variables: + CMAKE_GENERATOR: "NMake Makefiles JOM" + CMAKE_CI_BUILD_TYPE: Release + CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" + .windows_vs2022_x64_nmake: extends: - .windows_nmake @@ -103,6 +111,14 @@ variables: CMAKE_CONFIGURATION: windows_vs2022_x64_nmake +.windows_vs2022_x64_jom: + extends: + - .windows_jom + - .windows_vcvarsall_vs2022_x64 + + variables: + CMAKE_CONFIGURATION: windows_vs2022_x64_jom + .windows_msvc_v71_nmake: extends: .windows_nmake @@ -223,6 +239,18 @@ interruptible: true +.cmake_test_windows_jom: + stage: test-ext + + script: + - Invoke-Expression -Command .gitlab/ci/jom.ps1 + - $pwdpath = $pwd.Path + - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\jom;$env:PATH" + - Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1 + - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake + + interruptible: true + .cmake_test_windows_borland: stage: test-ext |