From 9f8f349ee7b62d513244430c422d011869e39d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Fri, 29 Nov 2024 11:05:22 +0200
Subject: [PATCH] ci: Update version checks for installing Rust tools

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1604>
---
 ci/install-rust.sh                        | 26 ++++++-----------------
 ci/windows-docker/install_cargo_utils.ps1 | 11 +++-------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/ci/install-rust.sh b/ci/install-rust.sh
index ed5d0c64a..7e9db0b96 100755
--- a/ci/install-rust.sh
+++ b/ci/install-rust.sh
@@ -27,33 +27,19 @@ if [ "$RUST_IMAGE_FULL" = "1" ]; then
   rustup component add rustfmt
 
   cargo install --locked cargo-deny
-    if [ "$RUST_VERSION" = "1.71.1" ]; then
-        cargo install --locked cargo-outdated
-    else
-        # Don't use --locked because time-0.3.30 does not build with 1.80 or newer
-        cargo install cargo-outdated
-    fi
+  # Don't use --locked because time-0.3.30 does not build with 1.80 or newer
+  cargo install cargo-outdated
   cargo install --locked typos-cli --version "1.19.0"
 
   # Coverage tools
   rustup component add llvm-tools-preview
-  if [ "$RUST_VERSION" = "1.71.1" ]; then
-      cargo install --locked grcov
-  else
-      # Don't use --locked because time-0.3.30 does not build with 1.80 or newer
-      cargo install grcov
-  fi
+  cargo install --locked grcov
 fi
 
-# Multiple dependencies of cargo-nextest require 1.74/1.75 nowadays
-if [ "$RUST_VERSION" = "1.71.1" ]; then
-  cargo install --locked cargo-nextest@0.9.67
-else
-  cargo install --locked cargo-nextest
-fi
+cargo install --locked cargo-nextest
 
-if [ "$RUST_VERSION" = "1.71.1" ]; then
-    cargo install --locked cargo-c --version 0.9.26+cargo-0.74
+if [ "$RUST_VERSION" = "1.80.1" ]; then
+    cargo install --locked cargo-c --version 0.10.5+cargo-0.83
 else
     cargo install --locked cargo-c --version 0.10.7+cargo-0.84
 fi
diff --git a/ci/windows-docker/install_cargo_utils.ps1 b/ci/windows-docker/install_cargo_utils.ps1
index 670617781..5d4c8c45b 100644
--- a/ci/windows-docker/install_cargo_utils.ps1
+++ b/ci/windows-docker/install_cargo_utils.ps1
@@ -4,8 +4,8 @@ rustup --version
 rustc --version
 cargo --version
 
-if ("$env:RUST_VERSION" -eq "1.71.1") {
-    cargo install --locked cargo-c --version 0.9.26+cargo-0.74
+if ("$env:RUST_VERSION" -eq "1.80.1") {
+    cargo install --locked cargo-c --version 0.10.5+cargo-0.93
 } else {
     cargo install --locked cargo-c --version 0.10.7+cargo-0.84
 }
@@ -15,12 +15,7 @@ if (!$?) {
   Exit 1
 }
 
-# Multiple dependencies of cargo-nextest require 1.74/1.75 nowadays
-if ("$env:RUST_VERSION" -eq "1.71.1") {
-    cargo install --locked cargo-nextest@0.9.67
-} else {
-    cargo install --locked cargo-nextest
-}
+cargo install --locked cargo-nextest
 
 if (!$?) {
   Write-Host "Failed to install cargo-nextest"