diff options
| author | Brad King <brad.king@kitware.com> | 2023-04-05 14:45:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-04-05 14:47:49 (GMT) |
| commit | 3532823dd740ea876e0362f84be9c97405e19205 (patch) | |
| tree | de861ffbeb697e2d47bebf8acab4acb90ae74a70 | |
| parent | 3f1a1bad76c7ab7f5ebb8757fe2902607d167492 (diff) | |
| download | CMake-3532823dd740ea876e0362f84be9c97405e19205.zip CMake-3532823dd740ea876e0362f84be9c97405e19205.tar.gz CMake-3532823dd740ea876e0362f84be9c97405e19205.tar.bz2 | |
ci: De-duplicate Windows test script for NMake job
Move job-specific setup to an environment script.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | .gitlab/ci/env_windows_vs2022_x64_nmake.ps1 | 1 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 10 |
3 files changed, 2 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb2bf01..b26172d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1051,7 +1051,7 @@ t:windows-vs2019-x64: t:windows-vs2022-x64-nmake: extends: - .windows_vs2022_x64_nmake - - .cmake_test_windows_nmake + - .cmake_test_windows_external - .windows_x86_64_tags_concurrent_vs2022 - .cmake_junit_artifacts - .run_dependent diff --git a/.gitlab/ci/env_windows_vs2022_x64_nmake.ps1 b/.gitlab/ci/env_windows_vs2022_x64_nmake.ps1 new file mode 100755 index 0000000..62463cd --- /dev/null +++ b/.gitlab/ci/env_windows_vs2022_x64_nmake.ps1 @@ -0,0 +1 @@ +Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1 diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index b915d4b..aa817d0 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -385,13 +385,3 @@ - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake interruptible: true - -.cmake_test_windows_nmake: - stage: test-ext - - script: - - . .gitlab/ci/env.ps1 - - Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1 - - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake - - interruptible: true |