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

ci: add default branch value

Browse source 
Gstreamer is now using 1.22
This commit is contained in:
Stéphane Cerveau 2023-03-06 12:16:30 +01:00
parent 2527a730d3
commit 0d25146878
6 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitlab-ci.yml
View file

@ -69,15 +69,14 @@ build-fedora-container:
# We also don't need a CONTEXT_DIR var as its also # We also don't need a CONTEXT_DIR var as its also
# hardcoded to be windows-docker/ # hardcoded to be windows-docker/
DOCKERFILE: 'ci/windows-docker/Dockerfile' DOCKERFILE: 'ci/windows-docker/Dockerfile'
GST_UPSTREAM_BRANCH: 'main' GST_UPSTREAM_BRANCH: '1.22'
tags: tags:
- 'windows' - 'windows'
- 'shell' - 'shell'
- '2022' - '2022'
script: script:
# We need to pass an array and to resolve the env vars, so we can't use a variable: # We need to pass an array and to resolve the env vars, so we can't use a variable:
- $DOCKER_BUILD_ARGS = @("--build-arg", "DEFAULT_BRANCH=$GST_UPSTREAM_BRANCH", "--build-arg", "RUST_VERSION=$RUST_VERSION") - $DOCKER_BUILD_ARGS = @("--build-arg", "DEFAULT_GST_BRANCH=$GST_UPSTREAM_BRANCH", "--build-arg", "RUST_VERSION=$RUST_VERSION")
- "& ci/windows-docker/container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $RUST_IMAGE $RUST_UPSTREAM_IMAGE $DOCKERFILE" - "& ci/windows-docker/container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $RUST_IMAGE $RUST_UPSTREAM_IMAGE $DOCKERFILE"
- | - |
if (!($?)) { if (!($?)) {

2
ci/images_template.yml
View file

@ -1,4 +1,4 @@
variables: variables:
GST_RS_IMG_TAG: '2023-03-03.0' GST_RS_IMG_TAG: '2023-04-12.0'
GST_RS_STABLE: '1.67.0' GST_RS_STABLE: '1.67.0'
GST_RS_MSRV: '1.63.0' GST_RS_MSRV: '1.63.0'

4
ci/windows-docker/Dockerfile
View file

@ -6,7 +6,9 @@ FROM "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2022-09-23.0-ma
ENV ErrorActionPreference='Stop' ENV ErrorActionPreference='Stop'
SHELL ["powershell","-NoLogo", "-NonInteractive", "-Command"] SHELL ["powershell","-NoLogo", "-NonInteractive", "-Command"]
ARG DEFAULT_BRANCH="main" ARG DEFAULT_GST_BRANCH="1.22"
ARG DEFAULT_GTK_BRANCH="4.8.2"
ARG DEFAULT_PANGO_BRANCH="1.50.14"
ARG RUST_VERSION="invalid" ARG RUST_VERSION="invalid"
RUN choco install -y pkgconfiglite nasm llvm RUN choco install -y pkgconfiglite nasm llvm

2
ci/windows-docker/install_gst.ps1
View file

@ -1,7 +1,7 @@
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
# Download gstreamer and all its subprojects # Download gstreamer and all its subprojects
git clone -b $env:DEFAULT_BRANCH --depth 1 https://gitlab.freedesktop.org/gstreamer/gstreamer.git C:\gstreamer git clone -b $env:DEFAULT_GST_BRANCH --depth 1 https://gitlab.freedesktop.org/gstreamer/gstreamer.git C:\gstreamer
if (!$?) { if (!$?) {
Write-Host "Failed to clone gstreamer" Write-Host "Failed to clone gstreamer"
Exit 1 Exit 1

2
ci/windows-docker/install_gtk.ps1
View file

@ -3,7 +3,7 @@
$env:MESON_ARGS = "--prefix=C:\gst-install\" $env:MESON_ARGS = "--prefix=C:\gst-install\"
# Download gtk and all its subprojects # Download gtk and all its subprojects
git clone -b 4.8.2 --depth 1 https://gitlab.gnome.org/gnome/gtk.git C:\gtk git clone -b $env:DEFAULT_GTK_BRANCH --depth 1 https://gitlab.gnome.org/gnome/gtk.git C:\gtk
if (!$?) { if (!$?) {
Write-Host "Failed to clone gtk" Write-Host "Failed to clone gtk"
Exit 1 Exit 1

2
ci/windows-docker/install_pango.ps1
View file

@ -3,7 +3,7 @@
$env:MESON_ARGS = "--prefix=C:\gst-install\ --wrap-mode=forcefallback" $env:MESON_ARGS = "--prefix=C:\gst-install\ --wrap-mode=forcefallback"
# Download pango all its subprojects # Download pango all its subprojects
git clone -b 1.50.14 --depth 1 https://gitlab.gnome.org/gnome/pango.git C:\pango git clone -b $env:DEFAULT_PANGO_BRANCH --depth 1 https://gitlab.gnome.org/gnome/pango.git C:\pango
if (!$?) { if (!$?) {
Write-Host "Failed to clone pango" Write-Host "Failed to clone pango"
Exit 1 Exit 1