From 8af9a52d3e9d9965f306099afc288b86db99e748 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 5 Apr 2023 10:40:16 -0400 Subject: ci: De-duplicate Windows test script for MSVC v71 NMake job Move job-specific setup to an environment script. --- .gitlab-ci.yml | 2 +- .gitlab/ci/env_windows_msvc_v71_nmake.ps1 | 2 ++ .gitlab/os-windows.yml | 11 ----------- 3 files changed, 3 insertions(+), 12 deletions(-) create mode 100755 .gitlab/ci/env_windows_msvc_v71_nmake.ps1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ee4930..5ec100c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1195,7 +1195,7 @@ t:mingw_osdn_io-msys_makefiles: t:windows-msvc-v71-nmake: extends: - .windows_msvc_v71_nmake - - .cmake_test_windows_msvc + - .cmake_test_windows_external - .windows_x86_64_tags_concurrent - .cmake_junit_artifacts - .run_dependent 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 0000000..cb3806d --- /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 efce201..34abb29 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 -- cgit v0.12