diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | .gitlab/ci/env_windows_vs2022_x64_jom.ps1 | 4 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 13 |
3 files changed, 5 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa3b699..fb2bf01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/.gitlab/ci/env_windows_vs2022_x64_jom.ps1 b/.gitlab/ci/env_windows_vs2022_x64_jom.ps1 new file mode 100755 index 0000000..c933421 --- /dev/null +++ b/.gitlab/ci/env_windows_vs2022_x64_jom.ps1 @@ -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 diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index b932b74..b915d4b 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -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 |