mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-05 21:31:08 -06:00
ci: De-duplicate Windows test script for JOM job
Move job-specific setup to an environment script.
This commit is contained in:
@@ -1065,7 +1065,7 @@ t:windows-vs2022-x64-nmake:
|
||||
t:windows-vs2022-x64-jom:
|
||||
extends:
|
||||
- .windows_vs2022_x64_jom
|
||||
- .cmake_test_windows_jom
|
||||
- .cmake_test_windows_external
|
||||
- .windows_x86_64_tags_concurrent_vs2022
|
||||
- .cmake_junit_artifacts
|
||||
- .run_dependent
|
||||
|
||||
4
.gitlab/ci/env_windows_vs2022_x64_jom.ps1
Executable file
4
.gitlab/ci/env_windows_vs2022_x64_jom.ps1
Executable file
@@ -0,0 +1,4 @@
|
||||
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
|
||||
@@ -395,16 +395,3 @@
|
||||
- build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake
|
||||
|
||||
interruptible: true
|
||||
|
||||
.cmake_test_windows_jom:
|
||||
stage: test-ext
|
||||
|
||||
script:
|
||||
- . .gitlab/ci/env.ps1
|
||||
- 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_standalone.cmake
|
||||
|
||||
interruptible: true
|
||||
|
||||
Reference in New Issue
Block a user