mirror of
https://gitlab.freedesktop.org/dabrain34/GstPipelineStudio.git
synced 2024-11-25 02:21:00 +00:00
ci: use wix install from latest gstreamer ci image
This commit is contained in:
parent
db83d15ab4
commit
0748e9352b
4 changed files with 15 additions and 4 deletions
|
@ -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:
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue