From 60363a9344fba6943283e551c69f84cf47d3064a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Tue, 13 Aug 2024 09:33:36 +0300
Subject: [PATCH] ci: Fix version checks

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1506>
---
 ci/images_template.yml                    |  2 +-
 ci/install-rust.sh                        | 18 +++++++++---------
 ci/windows-docker/install_cargo_utils.ps1 |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ci/images_template.yml b/ci/images_template.yml
index 82df56ae3..8cf64d935 100644
--- a/ci/images_template.yml
+++ b/ci/images_template.yml
@@ -1,5 +1,5 @@
 variables:
-  GST_RS_IMG_TAG: "2024-08-05.0"
+  GST_RS_IMG_TAG: "2024-08-13.0"
   GST_RS_STABLE: "1.80.1"
   GST_RS_MSRV: "1.71.1"
   # The branch we use to build GStreamer from in the docker images
diff --git a/ci/install-rust.sh b/ci/install-rust.sh
index b9a37fada..9f48b9745 100755
--- a/ci/install-rust.sh
+++ b/ci/install-rust.sh
@@ -27,28 +27,28 @@ if [ "$RUST_IMAGE_FULL" = "1" ]; then
   rustup component add rustfmt
 
   cargo install --locked --force cargo-deny
-    if [ "$RUST_VERSION" = "nightly" -o "$RUST_VERSION" = "1.80.0" ]; then
+    if [ "$RUST_VERSION" = "1.71.1" ]; then
+        cargo install --locked --force cargo-outdated
+    else
         # Don't use --locked because time-0.3.30 does not build with 1.80 or newer
         cargo install --force cargo-outdated
-    else
-        cargo install --locked --force cargo-outdated
     fi
   cargo install --locked --force typos-cli --version "1.19.0"
 
   # Coverage tools
   rustup component add llvm-tools-preview
-  if [ "$RUST_VERSION" = "nightly" -o "$RUST_VERSION" = "1.80.0" ]; then
+  if [ "$RUST_VERSION" = "1.71.1" ]; then
+      cargo install --locked --force grcov
+  else
       # Don't use --locked because time-0.3.30 does not build with 1.80 or newer
       cargo install --force grcov
-  else
-      cargo install --locked --force grcov
   fi
 fi
 
-if [ "$RUST_VERSION" = "nightly" -o "$RUST_VERSION" = "1.80.0" ]; then
-    cargo install --locked cargo-c --version 0.10.3+cargo-0.81
-else
+if [ "$RUST_VERSION" = "1.71.1" ]; then
     cargo install --locked cargo-c --version 0.9.26+cargo-0.74
+else
+    cargo install --locked cargo-c --version 0.10.3+cargo-0.81
 fi
 
 if [ "$RUST_VERSION" = "nightly" ]; then
diff --git a/ci/windows-docker/install_cargo_utils.ps1 b/ci/windows-docker/install_cargo_utils.ps1
index 920c44a94..976645061 100644
--- a/ci/windows-docker/install_cargo_utils.ps1
+++ b/ci/windows-docker/install_cargo_utils.ps1
@@ -4,10 +4,10 @@ rustup --version
 rustc --version
 cargo --version
 
-if (("$RUST_VERSION" -eq "nightly") -or ("$RUST_VERSION" -eq "1.80.0" )) {
-    cargo install --locked cargo-c --version 0.10.3+cargo-0.81
-} else {
+if ("$RUST_VERSION" -eq "1.71.1") {
     cargo install --locked cargo-c --version 0.9.26+cargo-0.74
+} else {
+    cargo install --locked cargo-c --version 0.10.3+cargo-0.81
 }
 
 if (!$?) {