summaryrefslogtreecommitdiff
path: root/.gitlab/os-windows.yml
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-09-12 12:29:57 -0400
committerBrad King <brad.king@kitware.com>2022-09-12 12:42:25 -0400
commit906b1a0bc4b8cb04e9eb879c26a4a5e3a7297fc9 (patch)
tree6dd388d8adb5012176c2e300de2443471caa33bd /.gitlab/os-windows.yml
parent6183332c27638a0990f0ee7fe6a088e0cadeca19 (diff)
downloadcmake-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/os-windows.yml')
-rw-r--r--.gitlab/os-windows.yml4
1 files changed, 2 insertions, 2 deletions
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