From ebc06257b5d5253f24b1f48af48b3f771cd6547c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 19 Mar 2024 09:55:53 +0200 Subject: [PATCH] ci: Rebuild image to pull in the GES fixes And follow the 1.24 branch of GStreamer for now. Part-of: --- ci/images_template.yml | 2 +- ci/install-gst.sh | 2 +- ci/windows-docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/images_template.yml b/ci/images_template.yml index 2060c8dbf..2b704270b 100644 --- a/ci/images_template.yml +++ b/ci/images_template.yml @@ -1,4 +1,4 @@ variables: - GST_RS_IMG_TAG: "2024-02-26.0" + GST_RS_IMG_TAG: "2024-03-19.0" GST_RS_STABLE: "1.76.0" GST_RS_MSRV: "1.70.0" diff --git a/ci/install-gst.sh b/ci/install-gst.sh index 438e4aafc..422ef230a 100755 --- a/ci/install-gst.sh +++ b/ci/install-gst.sh @@ -9,7 +9,7 @@ pushd . cd .. git clone https://gitlab.freedesktop.org/gstreamer/gstreamer.git \ --depth 1 \ - --branch main + --branch 1.24 cd gstreamer diff --git a/ci/windows-docker/Dockerfile b/ci/windows-docker/Dockerfile index 190864ba4..a5247dbeb 100644 --- a/ci/windows-docker/Dockerfile +++ b/ci/windows-docker/Dockerfile @@ -4,7 +4,7 @@ FROM "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2023-07-17.0-ma SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ARG DEFAULT_BRANCH="main" +ARG DEFAULT_BRANCH="1.24" ARG RUST_VERSION="invalid" RUN choco install -y pkgconfiglite nasm llvm openssl