From f446e3e43c03f1dd470e8c37f51ed0a897204d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Mon, 5 Aug 2024 11:24:45 +0300
Subject: [PATCH] ci: Update to cargo-c 0.9.26 and 0.10.3 when building for
 nightly

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

diff --git a/ci/install-rust.sh b/ci/install-rust.sh
index 77635d76c..8b22dd9ed 100755
--- a/ci/install-rust.sh
+++ b/ci/install-rust.sh
@@ -36,11 +36,9 @@ if [ "$RUST_IMAGE_FULL" = "1" ]; then
 fi
 
 if [ "$RUST_VERSION" = "nightly" ]; then
-    # FIXME: Don't build cargo-c with --locked for now because otherwise a
-    # version of ahash is used that doesn't build on nightly anymore
-    cargo install cargo-c --version 0.9.22+cargo-0.72
+    cargo install --locked cargo-c --version 0.10.3+cargo-0.81
 else
-    cargo install --locked cargo-c --version 0.9.22+cargo-0.72
+    cargo install --locked cargo-c --version 0.9.26+cargo-0.74
 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 2dd87a4b4..55d780e12 100644
--- a/ci/windows-docker/install_cargo_utils.ps1
+++ b/ci/windows-docker/install_cargo_utils.ps1
@@ -4,7 +4,11 @@ rustup --version
 rustc --version
 cargo --version
 
-cargo install --locked cargo-c --version 0.9.26+cargo-0.72
+if ("$RUST_VERSION" -eq "nightly") {
+    cargo install --locked cargo-c --version 0.10.3+cargo-0.81
+} else {
+    cargo install --locked cargo-c --version 0.9.26+cargo-0.74
+}
 
 if (!$?) {
   Write-Host "Failed to install cargo-c"