Browse Source

ci: De-duplicate Windows test script for NMake job

Move job-specific setup to an environment script.
Brad King 2 years ago
parent
commit
3532823dd7
3 changed files with 2 additions and 11 deletions
  1. 1 1
      .gitlab-ci.yml
  2. 1 0
      .gitlab/ci/env_windows_vs2022_x64_nmake.ps1
  3. 0 10
      .gitlab/os-windows.yml

+ 1 - 1
.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

+ 1 - 0
.gitlab/ci/env_windows_vs2022_x64_nmake.ps1

@@ -0,0 +1 @@
+Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1

+ 0 - 10
.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