diff options
| author | Brad King <brad.king@kitware.com> | 2023-04-05 10:40:16 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-04-05 10:46:48 -0400 |
| commit | 8af9a52d3e9d9965f306099afc288b86db99e748 (patch) | |
| tree | 8f88fca34a1c4d6daf682b2d0a74fd0ead173ffe /.gitlab | |
| parent | 430aa379d41ee3890957d070a0105468369ab755 (diff) | |
| download | cmake-8af9a52d3e9d9965f306099afc288b86db99e748.tar.gz | |
ci: De-duplicate Windows test script for MSVC v71 NMake job
Move job-specific setup to an environment script.
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci/env_windows_msvc_v71_nmake.ps1 | 2 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/.gitlab/ci/env_windows_msvc_v71_nmake.ps1 b/.gitlab/ci/env_windows_msvc_v71_nmake.ps1 new file mode 100755 index 0000000000..cb3806d1ca --- /dev/null +++ b/.gitlab/ci/env_windows_msvc_v71_nmake.ps1 @@ -0,0 +1,2 @@ +Invoke-Expression -Command .gitlab/ci/msvc.ps1 +Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1 diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index efce201dbf..34abb295d1 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -420,14 +420,3 @@ - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake interruptible: true - -.cmake_test_windows_msvc: - stage: test-ext - - script: - - . .gitlab/ci/env.ps1 - - Invoke-Expression -Command .gitlab/ci/msvc.ps1 - - Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1 - - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake - - interruptible: true |