mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git
synced 2024-05-19 00:38:06 +00:00
Merge branch 'alatiera/gst-upstream' into 'main'
ci: Move GST_UPSTREAM_BRANCH into the images_template.yml See merge request gstreamer/gstreamer-rs!1433
This commit is contained in:
commit
e7b2bf3436
|
@ -514,7 +514,6 @@ pages:
|
|||
# We also don't need a CONTEXT_DIR var as its also
|
||||
# hardcoded to be windows-docker/
|
||||
DOCKERFILE: 'ci/windows-docker/Dockerfile'
|
||||
GST_UPSTREAM_BRANCH: 'main'
|
||||
tags:
|
||||
- 'windows'
|
||||
- 'shell'
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
variables:
|
||||
GST_RS_IMG_TAG: "2024-04-10.0"
|
||||
GST_RS_IMG_TAG: "2024-04-28.0"
|
||||
GST_RS_STABLE: "1.77.2"
|
||||
GST_RS_MSRV: "1.70.0"
|
||||
# The branch we use to build GStreamer from in the docker images
|
||||
# Ex. main, 1.24, my-test-branch
|
||||
GST_UPSTREAM_BRANCH: 'main'
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
set -e
|
||||
|
||||
DEFAULT_BRANCH="$GST_UPSTREAM_BRANCH"
|
||||
|
||||
pip3 install meson==1.1.1 --break-system-packages
|
||||
|
||||
# gstreamer-rs already has a 'gstreamer' directory so don't clone there
|
||||
|
@ -9,7 +11,7 @@ pushd .
|
|||
cd ..
|
||||
git clone https://gitlab.freedesktop.org/gstreamer/gstreamer.git \
|
||||
--depth 1 \
|
||||
--branch 1.24
|
||||
--branch "$DEFAULT_BRANCH"
|
||||
|
||||
cd gstreamer
|
||||
|
||||
|
|
Loading…
Reference in a new issue