From 3532823dd740ea876e0362f84be9c97405e19205 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 5 Apr 2023 10:45:44 -0400 Subject: ci: De-duplicate Windows test script for NMake job Move job-specific setup to an environment script. --- .gitlab/ci/env_windows_vs2022_x64_nmake.ps1 | 1 + .gitlab/os-windows.yml | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) create mode 100755 .gitlab/ci/env_windows_vs2022_x64_nmake.ps1 (limited to '.gitlab') 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 0000000000..62463cd98c --- /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 b915d4bf87..aa817d0cf1 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 -- cgit v1.2.1