diff options
| author | Brad King <brad.king@kitware.com> | 2022-09-12 12:29:57 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-09-12 12:42:25 -0400 |
| commit | 906b1a0bc4b8cb04e9eb879c26a4a5e3a7297fc9 (patch) | |
| tree | 6dd388d8adb5012176c2e300de2443471caa33bd /.gitlab | |
| parent | 6183332c27638a0990f0ee7fe6a088e0cadeca19 (diff) | |
| download | cmake-906b1a0bc4b8cb04e9eb879c26a4a5e3a7297fc9.tar.gz | |
ci: allow powershell variables assigned in env scripts to persist
Load env scripts with `.` sourcing instead of `Invoke-Expression`.
This allows powershell variables to persist, much like bash.
Leave helper script loading unchanged, as those scripts may set
powershell variables that we do not want to persist.
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci/env.ps1 | 2 | ||||
| -rwxr-xr-x | .gitlab/ci/env_windows_vs2022_x64_ninja.ps1 | 2 | ||||
| -rwxr-xr-x | .gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 | 2 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab/ci/env.ps1 b/.gitlab/ci/env.ps1 index e24bc37ac1..aa7753fcda 100755 --- a/.gitlab/ci/env.ps1 +++ b/.gitlab/ci/env.ps1 @@ -1,3 +1,3 @@ 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" } diff --git a/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 b/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 index f8a86c4be8..a96658dd0f 100755 --- a/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 +++ b/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 @@ -1,3 +1,3 @@ if ("$env:CMAKE_CI_NIGHTLY" -eq "true") { - Invoke-Expression ".gitlab/ci/ispc-env.ps1" + . ".gitlab/ci/ispc-env.ps1" } diff --git a/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 b/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 index e8d242c8fa..f245319675 100755 --- a/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 +++ b/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 @@ -1,5 +1,5 @@ if ("$env:CMAKE_CI_NIGHTLY" -eq "true") { - Invoke-Expression -Command ".gitlab/ci/ispc-env.ps1" + . ".gitlab/ci/ispc-env.ps1" } $pwdpath = $pwd.Path diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 282cf1eb58..92538a1f27 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -293,7 +293,7 @@ ## 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" - Set-Item -Force -Path "env:WIX" -Value "$pwdpath\.gitlab\wix" @@ -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 |