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 | |
| 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')
| -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 |
3 files changed, 3 insertions, 11 deletions
diff --git a/.gitlab/ci/env_windows_clang_ninja.ps1 b/.gitlab/ci/env_windows_clang_ninja.ps1 new file mode 100755 index 0000000..17002ef --- /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 0000000..89fa360 --- /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 6f9c292..bb19de9 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 |