mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-25 09:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

ci: Provide WiX 3 in PATH of jobs that need it

Browse Source 
Drop the `WIX` environment variable.
This commit is contained in:
Brad King
2024-03-14 11:35:34 -04:00
parent b71b6300e5
commit cb1b2dc664
7 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/ci/env_windows_arm64_package.ps1
Executable
+1
View File
@@ -0,0 +1 @@
. .gitlab/ci/wix3-env.ps1
.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1
Executable
+1
View File
@@ -0,0 +1 @@
. .gitlab/ci/wix3-env.ps1
.gitlab/ci/env_windows_i386_package.ps1
Executable
+1
View File
@@ -0,0 +1 @@
. .gitlab/ci/wix3-env.ps1
.gitlab/ci/env_windows_vs2022_x64_ninja.ps1
+2
View File
@@ -3,3 +3,5 @@ if ("$env:CMAKE_CI_NIGHTLY" -eq "true") {
. ".gitlab/ci/ispc-env.ps1"
. ".gitlab/ci/swift-env.ps1"
}
. .gitlab/ci/wix3-env.ps1
.gitlab/ci/env_windows_x86_64_package.ps1
Executable
+1
View File
@@ -0,0 +1 @@
. .gitlab/ci/wix3-env.ps1
.gitlab/ci/wix3-env.ps1
Executable
+6
View File
@@ -0,0 +1,6 @@
& "$pwsh" -File .gitlab/ci/wix3.ps1
$pwdpath = $pwd.Path
Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\wix3;$env:PATH"
light -help | Select -First 1
.gitlab/os-windows.yml
-3
View File
@@ -387,13 +387,10 @@
.before_script_windows: &before_script_windows
- . .gitlab/ci/env.ps1
- $pwdpath = $pwd.Path
- (& "$pwsh" -File ".gitlab/ci/wix3.ps1")
- Set-Item -Force -Path "env:WIX" -Value "$pwdpath\.gitlab\wix3"
- (& "$pwsh" -File ".gitlab/ci/cmake.ps1")
- Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\cmake\bin;$env:PATH"
- $cmake = "cmake"
- . .gitlab/ci/ninja-env.ps1
- (& "$env:WIX\bin\light.exe" -help) | Select -First 1
- cmake --version
- . .gitlab/ci/qt-env.ps1
- . .gitlab/ci/python-env.ps1