diff options
author | Brad King <brad.king@kitware.com> | 2022-11-10 09:33:45 -0500 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2022-11-10 13:24:51 -0500 |
commit | 3eb94e4d51b5f5f66518bdcaef09a75dd2305606 (patch) | |
tree | 654fe3d2150bcf04a8133d3c6b8542903afda466 | |
parent | 8ba5835c8d77b5d61847eba06feac8cfd6682b45 (diff) | |
download | cmake-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.
-rw-r--r-- | .gitlab-ci.yml | 8 | ||||
-rwxr-xr-x | .gitlab/ci/env_windows_clang_ninja.ps1 | 2 | ||||
-rwxr-xr-x | .gitlab/ci/env_windows_clang_nmake.ps1 | 1 | ||||
-rw-r--r-- | .gitlab/os-windows.yml | 11 |
4 files changed, 7 insertions, 15 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 diff --git a/.gitlab/ci/env_windows_clang_ninja.ps1 b/.gitlab/ci/env_windows_clang_ninja.ps1 new file mode 100755 index 0000000000..17002ef4c9 --- /dev/null +++ b/.gitlab/ci/env_windows_clang_ninja.ps1 @@ -0,0 +1,2 @@ +. .gitlab/ci/ninja-env.ps1 +. .gitlab/ci/clang-env.ps1 diff --git a/.gitlab/ci/env_windows_clang_nmake.ps1 b/.gitlab/ci/env_windows_clang_nmake.ps1 new file mode 100755 index 0000000000..89fa360cb8 --- /dev/null +++ b/.gitlab/ci/env_windows_clang_nmake.ps1 @@ -0,0 +1 @@ +. .gitlab/ci/clang-env.ps1 diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 6f9c292d54..bb19de9038 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -390,17 +390,6 @@ interruptible: true -.cmake_test_windows_clang: - stage: test-ext - - script: - - . .gitlab/ci/env.ps1 - - . .gitlab/ci/ninja-env.ps1 - - . .gitlab/ci/clang-env.ps1 - - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake - - interruptible: true - .cmake_test_windows_msvc: stage: test-ext |