mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 12:19:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

ci: Simplify LLVM/Clang CI job specs on Windows

Browse Source 
Move environment setup to job-specific scripts so we can reuse
the common `.cmake_test_windows_external` code path.
This commit is contained in:
Brad King
2022-11-10 09:33:45 -05:00
parent 8ba5835c8d
commit 3eb94e4d51
4 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+4 -4
View File
@@ -1003,7 +1003,7 @@ t:windows-borland5.8:
t:windows-clang13.0-cl-ninja: t:windows-clang13.0-cl-ninja:
extends: extends:
- .windows_clang_ninja - .windows_clang_ninja
- .cmake_test_windows_clang - .cmake_test_windows_external
- .windows_tags_concurrent - .windows_tags_concurrent
- .cmake_junit_artifacts - .cmake_junit_artifacts
- .run_dependent - .run_dependent
@@ -1018,7 +1018,7 @@ t:windows-clang13.0-cl-ninja:
t:windows-clang13.0-cl-nmake: t:windows-clang13.0-cl-nmake:
extends: extends:
- .windows_clang_nmake - .windows_clang_nmake
- .cmake_test_windows_clang - .cmake_test_windows_external
- .windows_tags_concurrent - .windows_tags_concurrent
- .cmake_junit_artifacts - .cmake_junit_artifacts
- .run_dependent - .run_dependent
@@ -1033,7 +1033,7 @@ t:windows-clang13.0-cl-nmake:
t:windows-clang13.0-gnu-ninja: t:windows-clang13.0-gnu-ninja:
extends: extends:
- .windows_clang_ninja - .windows_clang_ninja
- .cmake_test_windows_clang - .cmake_test_windows_external
- .windows_tags_concurrent - .windows_tags_concurrent
- .cmake_junit_artifacts - .cmake_junit_artifacts
- .run_dependent - .run_dependent
@@ -1048,7 +1048,7 @@ t:windows-clang13.0-gnu-ninja:
t:windows-clang13.0-gnu-nmake: t:windows-clang13.0-gnu-nmake:
extends: extends:
- .windows_clang_nmake - .windows_clang_nmake
- .cmake_test_windows_clang - .cmake_test_windows_external
- .windows_tags_concurrent - .windows_tags_concurrent
- .cmake_junit_artifacts - .cmake_junit_artifacts
- .run_dependent - .run_dependent
.gitlab/ci/env_windows_clang_ninja.ps1
Executable
+2
View File
@@ -0,0 +1,2 @@
. .gitlab/ci/ninja-env.ps1
. .gitlab/ci/clang-env.ps1
.gitlab/ci/env_windows_clang_nmake.ps1
Executable
+1
View File
@@ -0,0 +1 @@
. .gitlab/ci/clang-env.ps1
.gitlab/os-windows.yml
-11
View File
@@ -390,17 +390,6 @@
interruptible: true 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: .cmake_test_windows_msvc:
stage: test-ext stage: test-ext