From 0748e9352b9660f359c4bf1c898316f12aa76d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= <scerveau@igalia.com>
Date: Wed, 12 Apr 2023 12:02:36 +0200
Subject: [PATCH] ci: use wix install from latest gstreamer ci image

---
 .gitlab-ci.yml                    |  1 -
 ci/images_template.yml            |  2 +-
 ci/windows-docker/Dockerfile      |  2 +-
 installer/wix/build_installer.ps1 | 14 +++++++++++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72411e6..9401643 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,7 +107,6 @@ windows installer stable:
   script:
     - git fetch --tags
     - "& ./ci/build_gps.ps1"
-    - "& ./installer/wix/prepare_wix.ps1"
     - "& ./installer/wix/prepare_gstreamer.ps1"
     - "& ./installer/wix/build_installer.ps1"
   artifacts:
diff --git a/ci/images_template.yml b/ci/images_template.yml
index 53bada6..4ae3a5f 100644
--- a/ci/images_template.yml
+++ b/ci/images_template.yml
@@ -1,4 +1,4 @@
 variables:
-  GST_RS_IMG_TAG: '2023-04-12.0'
+  GST_RS_IMG_TAG: '2023-04-12.1'
   GST_RS_STABLE: '1.67.0'
   GST_RS_MSRV: '1.63.0'
diff --git a/ci/windows-docker/Dockerfile b/ci/windows-docker/Dockerfile
index ae0697b..9c5b95b 100644
--- a/ci/windows-docker/Dockerfile
+++ b/ci/windows-docker/Dockerfile
@@ -1,6 +1,6 @@
 # escape=`
 
-FROM "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2022-09-23.0-main"
+FROM "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2023-03-20.0-main"
 
 # Make sure any failure in PowerShell is fatal
 ENV ErrorActionPreference='Stop'
diff --git a/installer/wix/build_installer.ps1 b/installer/wix/build_installer.ps1
index f1d7106..63a3e28 100644
--- a/installer/wix/build_installer.ps1
+++ b/installer/wix/build_installer.ps1
@@ -1,7 +1,19 @@
-$wixFolder = Join-Path $PSScriptRoot -ChildPath 'wix/'
+# Check wix installation
+$wixInstalledFolder = "C:\Program Files (x86)\WiX Toolset v3.11\bin"
+if(Test-Path $wixInstalledFolder)
+{
+    $wixFolder = $wixInstalledFolder
+}
+else
+{
+    $prepareWix = Join-Path $PSScriptRoot -ChildPath prepare_wix.ps1
+    & "$prepareWix"
+    $wixFolder = Join-Path $PSScriptRoot -ChildPath 'wix/'
+}
 $candleToolPath = Join-Path $wixFolder -ChildPath candle.exe
 $lightToolPath = Join-Path $wixFolder -ChildPath light.exe
 $heatToolPath = Join-Path $wixFolder -ChildPath heat.exe
+
 $GPSUpgradeCode = "9B87C8FF-599C-4F20-914E-AF5E68CB3DC0"
 $GPSVersion = $(git describe --always --abbrev=0)
 Write-Output $GPSVersion