echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Factor out helper to load ninja into environment on Windows

Browse Source
This commit is contained in:
Brad King 2022-11-10 09:22:11 -05:00
parent 93ff726114
commit bf2e4a2e85
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1
View File

@ -2,9 +2,6 @@ if ("$env:CMAKE_CI_NIGHTLY" -eq "true") {
. ".gitlab/ci/ispc-env.ps1"
}
$pwdpath = $pwd.Path
& "$pwsh" -File ".gitlab/ci/ninja.ps1"
Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab;$env:PATH"
ninja --version
. .gitlab/ci/ninja-env.ps1
Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1

4
.gitlab/ci/ninja-env.ps1 Executable file
View File

@ -0,0 +1,4 @@
$pwdpath = $pwd.Path
& "$pwsh" -File ".gitlab/ci/ninja.ps1"
Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab;$env:PATH"
Write-Host "ninja version: $(ninja --version)"

9
.gitlab/os-windows.yml
View File

@ -299,11 +299,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
@ -397,11 +395,10 @@
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"
- . .gitlab/ci/ninja-env.ps1
- Invoke-Expression -Command .gitlab/ci/clang.ps1
- Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1
- $pwdpath = $pwd.Path
- 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