ci: De-duplicate Windows test script for NMake job

Move job-specific setup to an environment script.
2023-04-05 10:45:44 -04:00 · 2023-04-05 10:45:44 -04:00 · 3532823dd7
commit 3532823dd7
parent 3f1a1bad76
3 changed files with 2 additions and 11 deletions
--- 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
--- a/.gitlab/ci/env_windows_vs2022_x64_nmake.ps1
+++ b/.gitlab/ci/env_windows_vs2022_x64_nmake.ps1
@ -0,0 +1 @@
+Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1
--- 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
				`@ -0,0 +1 @@`
				`Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1`