From cb1b2dc664a21e0792afadba51f1c566db90ff37 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 14 Mar 2024 11:35:34 -0400
Subject: ci: Provide WiX 3 in PATH of jobs that need it

Drop the `WIX` environment variable.
---
 .gitlab/ci/env_windows_arm64_package.ps1      | 1 +
 .gitlab/ci/env_windows_arm64_vs2022_ninja.ps1 | 1 +
 .gitlab/ci/env_windows_i386_package.ps1       | 1 +
 .gitlab/ci/env_windows_vs2022_x64_ninja.ps1   | 2 ++
 .gitlab/ci/env_windows_x86_64_package.ps1     | 1 +
 .gitlab/ci/wix3-env.ps1                       | 6 ++++++
 .gitlab/os-windows.yml                        | 3 ---
 7 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100755 .gitlab/ci/env_windows_arm64_package.ps1
 create mode 100755 .gitlab/ci/env_windows_arm64_vs2022_ninja.ps1
 create mode 100755 .gitlab/ci/env_windows_i386_package.ps1
 create mode 100755 .gitlab/ci/env_windows_x86_64_package.ps1
 create mode 100755 .gitlab/ci/wix3-env.ps1

diff --git a/.gitlab/ci/env_windows_arm64_package.ps1 b/.gitlab/ci/env_windows_arm64_package.ps1
new file mode 100755
index 0000000..a898007
--- /dev/null
+++ b/.gitlab/ci/env_windows_arm64_package.ps1
@@ -0,0 +1 @@
+. .gitlab/ci/wix3-env.ps1
diff --git a/.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1 b/.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1
new file mode 100755
index 0000000..a898007
--- /dev/null
+++ b/.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1
@@ -0,0 +1 @@
+. .gitlab/ci/wix3-env.ps1
diff --git a/.gitlab/ci/env_windows_i386_package.ps1 b/.gitlab/ci/env_windows_i386_package.ps1
new file mode 100755
index 0000000..a898007
--- /dev/null
+++ b/.gitlab/ci/env_windows_i386_package.ps1
@@ -0,0 +1 @@
+. .gitlab/ci/wix3-env.ps1
diff --git a/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 b/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1
index b512e37..0649b9f 100755
--- a/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1
+++ b/.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
diff --git a/.gitlab/ci/env_windows_x86_64_package.ps1 b/.gitlab/ci/env_windows_x86_64_package.ps1
new file mode 100755
index 0000000..a898007
--- /dev/null
+++ b/.gitlab/ci/env_windows_x86_64_package.ps1
@@ -0,0 +1 @@
+. .gitlab/ci/wix3-env.ps1
diff --git a/.gitlab/ci/wix3-env.ps1 b/.gitlab/ci/wix3-env.ps1
new file mode 100755
index 0000000..a872b74
--- /dev/null
+++ b/.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
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index 94e35f3..3cd6e56 100644
--- a/.gitlab/os-windows.yml
+++ b/.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
-- 
cgit v0.12