mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-07 07:08:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ci-pwsh-cleanup'

Browse Source 
94b27ccc36 ci: add support for gitlab-runner 'shell = pwsh' executor
de32c8ddbe ci: start every windows job with custom environment script
906b1a0bc4 ci: allow powershell variables assigned in env scripts to persist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7667
This commit is contained in:
Brad King
2022-09-13 13:45:04 +00:00
committed by Kitware Robot
parent 168e4491de 94b27ccc36
commit fd30362681
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab/ci/env.ps1
View File

@@ -1,3 +1,4 @@
$pwsh = [System.Diagnostics.Process]::GetCurrentProcess().MainModule.FileName
if (Test-Path -Path ".gitlab/ci/env_$env:CMAKE_CONFIGURATION.ps1" -PathType Leaf) {
Invoke-Expression ".gitlab/ci/env_$env:CMAKE_CONFIGURATION.ps1"
. ".gitlab/ci/env_$env:CMAKE_CONFIGURATION.ps1"
}

2
.gitlab/ci/env_windows_vs2022_x64_ninja.ps1
View File

@@ -1,3 +1,3 @@
if ("$env:CMAKE_CI_NIGHTLY" -eq "true") {
Invoke-Expression ".gitlab/ci/ispc-env.ps1"
. ".gitlab/ci/ispc-env.ps1"
}

4
.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1
View File

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

2
.gitlab/ci/ispc-env.ps1
View File

@@ -1,4 +1,4 @@
$pwdpath = $pwd.Path
powershell -File ".gitlab/ci/ispc.ps1"
& "$pwsh" -File ".gitlab/ci/ispc.ps1"
Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\ispc\bin;$env:PATH"
ispc --version

18
.gitlab/os-windows.yml
View File

@@ -293,13 +293,13 @@
## Windows-specific scripts
.before_script_windows: &before_script_windows
- Invoke-Expression -Command .gitlab/ci/env.ps1
- . .gitlab/ci/env.ps1
- $pwdpath = $pwd.Path
- powershell -File ".gitlab/ci/wix.ps1"
- (& "$pwsh" -File ".gitlab/ci/wix.ps1")
- Set-Item -Force -Path "env:WIX" -Value "$pwdpath\.gitlab\wix"
- powershell -File ".gitlab/ci/cmake.ps1"
- (& "$pwsh" -File ".gitlab/ci/cmake.ps1")
- Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\cmake\bin;$env:PATH"
- powershell -File ".gitlab/ci/ninja.ps1"
- (& "$pwsh" -File ".gitlab/ci/ninja.ps1")
- Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab;$env:PATH"
- (& "$env:WIX\bin\light.exe" -help) | Select -First 1
- cmake --version
@@ -352,7 +352,7 @@
stage: test-ext
script:
- Invoke-Expression -Command .gitlab/ci/env.ps1
- . .gitlab/ci/env.ps1
- build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake
interruptible: true
@@ -361,6 +361,7 @@
stage: test-ext
script:
- . .gitlab/ci/env.ps1
- Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1
- build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake
@@ -370,6 +371,7 @@
stage: test-ext
script:
- . .gitlab/ci/env.ps1
- Invoke-Expression -Command .gitlab/ci/jom.ps1
- $pwdpath = $pwd.Path
- Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\jom;$env:PATH"
@@ -382,6 +384,7 @@
stage: test-ext
script:
- . .gitlab/ci/env.ps1
- Invoke-Expression -Command .gitlab/ci/borland.ps1
- $pwdpath = $pwd.Path
- Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\bcc\bin;$env:PATH"
@@ -393,8 +396,9 @@
stage: test-ext
script:
- . .gitlab/ci/env.ps1
- $pwdpath = $pwd.Path
- powershell -File ".gitlab/ci/ninja.ps1"
- (& "$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
@@ -407,6 +411,7 @@
stage: test-ext
script:
- . .gitlab/ci/env.ps1
- Invoke-Expression -Command .gitlab/ci/msvc.ps1
- Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1
- build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake
@@ -417,6 +422,7 @@
stage: test-ext
script:
- . .gitlab/ci/env.ps1
- Invoke-Expression -Command .gitlab/ci/openwatcom.ps1
- $pwdpath = $pwd.Path
- Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\watcom\binnt;$pwdpath\.gitlab\watcom\binw;$env:PATH"