summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-11-10 09:33:45 -0500
committerBrad King <brad.king@kitware.com>2022-11-10 13:24:51 -0500
commit3eb94e4d51b5f5f66518bdcaef09a75dd2305606 (patch)
tree654fe3d2150bcf04a8133d3c6b8542903afda466 /.gitlab-ci.yml
parent8ba5835c8d77b5d61847eba06feac8cfd6682b45 (diff)
downloadcmake-3eb94e4d51b5f5f66518bdcaef09a75dd2305606.tar.gz
ci: Simplify LLVM/Clang CI job specs on Windows
Move environment setup to job-specific scripts so we can reuse the common `.cmake_test_windows_external` code path.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e5824d728..ca1437befb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1003,7 +1003,7 @@ t:windows-borland5.8:
t:windows-clang13.0-cl-ninja:
extends:
- .windows_clang_ninja
- - .cmake_test_windows_clang
+ - .cmake_test_windows_external
- .windows_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
@@ -1018,7 +1018,7 @@ t:windows-clang13.0-cl-ninja:
t:windows-clang13.0-cl-nmake:
extends:
- .windows_clang_nmake
- - .cmake_test_windows_clang
+ - .cmake_test_windows_external
- .windows_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
@@ -1033,7 +1033,7 @@ t:windows-clang13.0-cl-nmake:
t:windows-clang13.0-gnu-ninja:
extends:
- .windows_clang_ninja
- - .cmake_test_windows_clang
+ - .cmake_test_windows_external
- .windows_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
@@ -1048,7 +1048,7 @@ t:windows-clang13.0-gnu-ninja:
t:windows-clang13.0-gnu-nmake:
extends:
- .windows_clang_nmake
- - .cmake_test_windows_clang
+ - .cmake_test_windows_external
- .windows_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent