|
|
@@ -295,11 +295,11 @@
|
|
|
.before_script_windows: &before_script_windows
|
|
|
- . .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
|
|
|
@@ -398,7 +398,7 @@
|
|
|
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
|