diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-11 13:26:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-11 13:26:32 (GMT) |
| commit | b0f02511e59bc02441f6211ea1ca8810d0ee77a5 (patch) | |
| tree | 0dd3dbc7c16bc725c1981e3e71969727c9ce60e0 /.gitlab/os-windows.yml | |
| parent | f2b438cb0afb577ee87c8bc2295ed3d263fc85f2 (diff) | |
| parent | 46b2849550821353f1eb513527c1f47dc761cc68 (diff) | |
| download | CMake-b0f02511e59bc02441f6211ea1ca8810d0ee77a5.zip CMake-b0f02511e59bc02441f6211ea1ca8810d0ee77a5.tar.gz CMake-b0f02511e59bc02441f6211ea1ca8810d0ee77a5.tar.bz2 | |
Merge topic 'ci-clang15-windows'
46b2849550 ci: Update LLVM/Clang to 15.0 in nightly CI jobs on Windows
3eb94e4d51 ci: Simplify LLVM/Clang CI job specs on Windows
8ba5835c8d ci: Factor out helper to load clang into environment on Windows
bf2e4a2e85 ci: Factor out helper to load ninja into environment on Windows
93ff726114 Tests: Fix TryCompile bad source case for clang-cl 15 on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7897
Diffstat (limited to '.gitlab/os-windows.yml')
| -rw-r--r-- | .gitlab/os-windows.yml | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 271610b..0933802 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -322,11 +322,9 @@ - Set-Item -Force -Path "env:WIX" -Value "$pwdpath\.gitlab\wix" - (& "$pwsh" -File ".gitlab/ci/cmake.ps1") - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\cmake\bin;$env:PATH" - - (& "$pwsh" -File ".gitlab/ci/ninja.ps1") - - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab;$env:PATH" + - . .gitlab/ci/ninja-env.ps1 - (& "$env:WIX\bin\light.exe" -help) | Select -First 1 - cmake --version - - ninja --version - cmake -P .gitlab/ci/download_qt.cmake - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\qt\bin;$env:PATH" - cmake -P .gitlab/ci/download_python3.cmake @@ -415,21 +413,6 @@ interruptible: true -.cmake_test_windows_clang: - stage: test-ext - - script: - - . .gitlab/ci/env.ps1 - - $pwdpath = $pwd.Path - - (& "$pwsh" -File ".gitlab/ci/ninja.ps1") - - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab;$env:PATH" - - Invoke-Expression -Command .gitlab/ci/clang.ps1 - - Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1 - - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\llvm\bin;$env:PATH" - - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake - - interruptible: true - .cmake_test_windows_msvc: stage: test-ext |