mirrors/GstPipelineStudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dabrain34/GstPipelineStudio.git synced 2024-11-22 00:50:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

ci: use wix install from latest gstreamer ci image

Browse source
This commit is contained in:
Stéphane Cerveau 2023-04-12 12:02:36 +02:00
parent db83d15ab4
commit 0748e9352b
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.yml
View file

@ -107,7 +107,6 @@ windows installer stable:
script: script:
- git fetch --tags - git fetch --tags
- "& ./ci/build_gps.ps1" - "& ./ci/build_gps.ps1"
- "& ./installer/wix/prepare_wix.ps1"
- "& ./installer/wix/prepare_gstreamer.ps1" - "& ./installer/wix/prepare_gstreamer.ps1"
- "& ./installer/wix/build_installer.ps1" - "& ./installer/wix/build_installer.ps1"
artifacts: artifacts:

2
ci/images_template.yml
View file

@ -1,4 +1,4 @@
variables: 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_STABLE: '1.67.0'
GST_RS_MSRV: '1.63.0' GST_RS_MSRV: '1.63.0'

2
ci/windows-docker/Dockerfile
View file

@ -1,6 +1,6 @@
# escape=` # 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 # Make sure any failure in PowerShell is fatal
ENV ErrorActionPreference='Stop' ENV ErrorActionPreference='Stop'

14
installer/wix/build_installer.ps1
View file

@ -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 $candleToolPath = Join-Path $wixFolder -ChildPath candle.exe
$lightToolPath = Join-Path $wixFolder -ChildPath light.exe $lightToolPath = Join-Path $wixFolder -ChildPath light.exe
$heatToolPath = Join-Path $wixFolder -ChildPath heat.exe $heatToolPath = Join-Path $wixFolder -ChildPath heat.exe
$GPSUpgradeCode = "9B87C8FF-599C-4F20-914E-AF5E68CB3DC0" $GPSUpgradeCode = "9B87C8FF-599C-4F20-914E-AF5E68CB3DC0"
$GPSVersion = $(git describe --always --abbrev=0) $GPSVersion = $(git describe --always --abbrev=0)
Write-Output $GPSVersion Write-Output $GPSVersion