Browse Source

ci: Provide WiX 3 in versioned location

Prepare to provide multiple WiX major versions for testing.
Brad King 1 year ago
parent
commit
b71b6300e5
3 changed files with 5 additions and 4 deletions
  1. 1 1
      .gitlab/.gitignore
  2. 2 1
      .gitlab/ci/wix3.ps1
  3. 2 2
      .gitlab/os-windows.yml

+ 1 - 1
.gitlab/.gitignore

@@ -21,6 +21,6 @@
 /tmp
 /tmp
 /unstable-jom*
 /unstable-jom*
 /watcom
 /watcom
-/wix*
+/wix3
 /clang-tidy-fixes
 /clang-tidy-fixes
 /num_warnings.txt
 /num_warnings.txt

+ 2 - 1
.gitlab/ci/wix.ps1 → .gitlab/ci/wix3.ps1

@@ -17,4 +17,5 @@ if ($hash.Hash -ne $sha256sum) {
 }
 }
 
 
 Add-Type -AssemblyName System.IO.Compression.FileSystem
 Add-Type -AssemblyName System.IO.Compression.FileSystem
-[System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir\wix\bin")
+[System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir\wix3")
+Remove-Item "$outdir\$tarball"

+ 2 - 2
.gitlab/os-windows.yml

@@ -387,8 +387,8 @@
 .before_script_windows: &before_script_windows
 .before_script_windows: &before_script_windows
     - . .gitlab/ci/env.ps1
     - . .gitlab/ci/env.ps1
     - $pwdpath = $pwd.Path
     - $pwdpath = $pwd.Path
-    - (& "$pwsh" -File ".gitlab/ci/wix.ps1")
-    - Set-Item -Force -Path "env:WIX" -Value "$pwdpath\.gitlab\wix"
+    - (& "$pwsh" -File ".gitlab/ci/wix3.ps1")
+    - Set-Item -Force -Path "env:WIX" -Value "$pwdpath\.gitlab\wix3"
     - (& "$pwsh" -File ".gitlab/ci/cmake.ps1")
     - (& "$pwsh" -File ".gitlab/ci/cmake.ps1")
     - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\cmake\bin;$env:PATH"
     - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\cmake\bin;$env:PATH"
     - $cmake = "cmake"
     - $cmake = "cmake"