From cb560e59a3f32f2ee42572cf5d2e3729e607e899 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Sun, 28 Apr 2024 10:29:37 +0300
Subject: [PATCH 1/2] ci: Move GST_UPSTREAM_BRANCH into the images_template.yml

Used for determining which version of gstreamer we will build
in the docker images. Move it along ther other variables so
it will be easier to update.

Also change ci/install-gst.sh to avoid hardoding the version
and instead use the variable like the windows build does.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1433>
---
 .gitlab-ci.yml         | 1 -
 ci/images_template.yml | 3 +++
 ci/install-gst.sh      | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6994ad147..7295e2d09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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'
diff --git a/ci/images_template.yml b/ci/images_template.yml
index 39ada9029..1230d77db 100644
--- a/ci/images_template.yml
+++ b/ci/images_template.yml
@@ -2,3 +2,6 @@ variables:
   GST_RS_IMG_TAG: "2024-04-10.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'
diff --git a/ci/install-gst.sh b/ci/install-gst.sh
index 422ef230a..140d98c71 100755
--- a/ci/install-gst.sh
+++ b/ci/install-gst.sh
@@ -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
 

From 88a6977777fc0869a8321e9797a0f587ee088815 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Sun, 28 Apr 2024 10:40:00 +0300
Subject: [PATCH 2/2] ci: Bump the image tag to rebuild

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1433>
---
 ci/images_template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/images_template.yml b/ci/images_template.yml
index 1230d77db..721bee80b 100644
--- a/ci/images_template.yml
+++ b/ci/images_template.yml
@@ -1,5 +1,5 @@
 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