diff options
| -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 fb2bf01c9b..b26172d360 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 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 |