diff options
| author | Brad King <brad.king@kitware.com> | 2022-09-09 15:20:07 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-09-12 12:47:42 -0400 |
| commit | 94b27ccc361973cbbb19c715d702369a82efc700 (patch) | |
| tree | 7a71eb18857d523beaabcd57c080f4e837fc595c /.gitlab/ci | |
| parent | de32c8ddbe0766fe534e4af20f801b7fd8f72e14 (diff) | |
| download | cmake-94b27ccc361973cbbb19c715d702369a82efc700.tar.gz | |
ci: add support for gitlab-runner 'shell = pwsh' executor
Run powershell child scripts using the same powershell tool as the
parent script.
Diffstat (limited to '.gitlab/ci')
| -rwxr-xr-x | .gitlab/ci/env.ps1 | 1 | ||||
| -rwxr-xr-x | .gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 | 2 | ||||
| -rwxr-xr-x | .gitlab/ci/ispc-env.ps1 | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab/ci/env.ps1 b/.gitlab/ci/env.ps1 index aa7753fcda..72a8cb85e9 100755 --- a/.gitlab/ci/env.ps1 +++ b/.gitlab/ci/env.ps1 @@ -1,3 +1,4 @@ +$pwsh = [System.Diagnostics.Process]::GetCurrentProcess().MainModule.FileName if (Test-Path -Path ".gitlab/ci/env_$env:CMAKE_CONFIGURATION.ps1" -PathType Leaf) { . ".gitlab/ci/env_$env:CMAKE_CONFIGURATION.ps1" } diff --git a/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 b/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 index f245319675..e5f538ab89 100755 --- a/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 +++ b/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 @@ -3,7 +3,7 @@ if ("$env:CMAKE_CI_NIGHTLY" -eq "true") { } $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 diff --git a/.gitlab/ci/ispc-env.ps1 b/.gitlab/ci/ispc-env.ps1 index 1baea315cb..816c485c50 100755 --- a/.gitlab/ci/ispc-env.ps1 +++ b/.gitlab/ci/ispc-env.ps1 @@ -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 |