From 2a2ab054782c1e5ae8f32490a3118e7f45bd0ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Wed, 12 Apr 2023 14:41:05 +0200 Subject: [PATCH] fixup! ci: use wix install from latest gstreamer ci image --- ci/images_template.yml | 2 +- ci/windows-docker/Dockerfile | 2 +- installer/wix/build_installer.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 0788f70..63a3e28 100644 --- a/installer/wix/build_installer.ps1 +++ b/installer/wix/build_installer.ps1 @@ -1,5 +1,5 @@ # Check wix installation -$wixInstalledFolder = "C:\Program Files (x86)\Windows Installer XML v3.5\bin" +$wixInstalledFolder = "C:\Program Files (x86)\WiX Toolset v3.11\bin" if(Test-Path $wixInstalledFolder) { $wixFolder = $wixInstalledFolder