diff options
author | Brad King <brad.king@kitware.com> | 2022-11-10 14:33:45 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2022-11-10 18:24:51 (GMT) |
commit | 3eb94e4d51b5f5f66518bdcaef09a75dd2305606 (patch) | |
tree | 654fe3d2150bcf04a8133d3c6b8542903afda466 /.gitlab-ci.yml | |
parent | 8ba5835c8d77b5d61847eba06feac8cfd6682b45 (diff) | |
download | CMake-3eb94e4d51b5f5f66518bdcaef09a75dd2305606.zip CMake-3eb94e4d51b5f5f66518bdcaef09a75dd2305606.tar.gz CMake-3eb94e4d51b5f5f66518bdcaef09a75dd2305606.tar.bz2 |
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.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e5824d..ca1437b 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 |