Browse Source

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

Drop the `WIX` environment variable.
Brad King 1 year ago
parent
commit
cb1b2dc664

+ 1 - 0
.gitlab/ci/env_windows_arm64_package.ps1

@@ -0,0 +1 @@
+. .gitlab/ci/wix3-env.ps1

+ 1 - 0
.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1

@@ -0,0 +1 @@
+. .gitlab/ci/wix3-env.ps1

+ 1 - 0
.gitlab/ci/env_windows_i386_package.ps1

@@ -0,0 +1 @@
+. .gitlab/ci/wix3-env.ps1

+ 2 - 0
.gitlab/ci/env_windows_vs2022_x64_ninja.ps1

@@ -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

+ 1 - 0
.gitlab/ci/env_windows_x86_64_package.ps1

@@ -0,0 +1 @@
+. .gitlab/ci/wix3-env.ps1

+ 6 - 0
.gitlab/ci/wix3-env.ps1

@@ -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

+ 0 - 3
.gitlab/os-windows.yml

@@ -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