From e0eee40e4b8f634c0fd3aedc77c35b6aee26d516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= <scerveau@igalia.com>
Date: Fri, 14 Apr 2023 17:44:51 +0200
Subject: [PATCH] ci: use latest gstreamer image which includes rust

---
 .gitlab-ci.yml               | 4 ++--
 ci/images_template.yml       | 3 +--
 ci/install-rust.sh           | 4 ++++
 ci/windows-docker/Dockerfile | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 080e4bc..358f807 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,8 +13,8 @@ stages:
 variables:
   FDO_UPSTREAM_REPO: "dabrain34/GstPipelineStudio"
   GNOME_RUNTIME_IMAGE: 'quay.io/gnome_infrastructure/gnome-runtime-images:gnome-44'
-  WINDOWS_RUST_STABLE_IMAGE: "$CI_REGISTRY_IMAGE/windows:$GST_RS_IMG_TAG-main-$GST_RS_STABLE"
-  WINDOWS_RUST_STABLE_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows:$GST_RS_IMG_TAG-main-$GST_RS_STABLE"
+  WINDOWS_RUST_STABLE_IMAGE: "$CI_REGISTRY_IMAGE/windows:$GST_RS_IMG_TAG-main"
+  WINDOWS_RUST_STABLE_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows:$GST_RS_IMG_TAG-main"
 
 # Version and tag for our current container
 .fedora:
diff --git a/ci/images_template.yml b/ci/images_template.yml
index 4ae3a5f..b9b33a8 100644
--- a/ci/images_template.yml
+++ b/ci/images_template.yml
@@ -1,4 +1,3 @@
 variables:
-  GST_RS_IMG_TAG: '2023-04-12.1'
   GST_RS_STABLE: '1.67.0'
-  GST_RS_MSRV: '1.63.0'
+  GST_RS_IMG_TAG: '2023-04-14.1'
diff --git a/ci/install-rust.sh b/ci/install-rust.sh
index ec53d1b..8e98cb8 100755
--- a/ci/install-rust.sh
+++ b/ci/install-rust.sh
@@ -4,6 +4,10 @@ RUSTUP_VERSION=1.23.1
 RUST_VERSION=$1
 RUST_ARCH="x86_64-unknown-linux-gnu"
 
+rustup --version
+cargo --version
+rustc --version
+
 RUSTUP_URL=https://static.rust-lang.org/rustup/archive/$RUSTUP_VERSION/$RUST_ARCH/rustup-init
 wget $RUSTUP_URL
 
diff --git a/ci/windows-docker/Dockerfile b/ci/windows-docker/Dockerfile
index 9c5b95b..8a0789d 100644
--- a/ci/windows-docker/Dockerfile
+++ b/ci/windows-docker/Dockerfile
@@ -1,6 +1,6 @@
 # escape=`
 
-FROM "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2023-03-20.0-main"
+FROM "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2023-04-03.0-main"
 
 # Make sure any failure in PowerShell is fatal
 ENV ErrorActionPreference='Stop'