diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-12 17:03:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-11-15 15:24:32 (GMT) |
| commit | bbb26645477fd7d6532d805490bae20ce8971a06 (patch) | |
| tree | d72d71b796e288a43080a01f41909b2d2f235d27 | |
| parent | 658009b6fe279f91343a4c2797bbde1f8a3962fb (diff) | |
| download | CMake-bbb26645477fd7d6532d805490bae20ce8971a06.zip CMake-bbb26645477fd7d6532d805490bae20ce8971a06.tar.gz CMake-bbb26645477fd7d6532d805490bae20ce8971a06.tar.bz2 | |
gitlab-ci: Add wix, cmake, and ninja to PATH incrementally on Windows
Also run their scripts in an isolated child process.
| -rw-r--r-- | .gitlab/os-windows.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 4ecc120..7c578aa 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -151,13 +151,14 @@ ## Windows-specific scripts .before_script_windows: &before_script_windows - - Invoke-Expression -Command .gitlab/ci/wix.ps1 - - Invoke-Expression -Command .gitlab/ci/cmake.ps1 - - Invoke-Expression -Command .gitlab/ci/ninja.ps1 - $pwdpath = $pwd.Path + - powershell -File ".gitlab/ci/wix.ps1" - Set-Item -Force -Path "env:WIX" -Value "$pwdpath\.gitlab\wix" + - powershell -File ".gitlab/ci/cmake.ps1" + - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\cmake\bin;$env:PATH" + - powershell -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 - - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab;$pwdpath\.gitlab\cmake\bin;$env:PATH" - cmake --version - ninja --version - cmake -P .gitlab/ci/download_qt.cmake |