From 397abe0fb671b439a2885b1083ee609912e64447 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 16 Sep 2025 16:53:00 +0200
Subject: [PATCH] ci/fedora: manage rust version ourselves

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37414>
---
 .gitlab-ci/container/fedora/x86_64_build.sh | 3 ++-
 .gitlab-ci/image-tags.yml                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/container/fedora/x86_64_build.sh b/.gitlab-ci/container/fedora/x86_64_build.sh
index 0b533fd02ca..5af42fb3dc0 100644
--- a/.gitlab-ci/container/fedora/x86_64_build.sh
+++ b/.gitlab-ci/container/fedora/x86_64_build.sh
@@ -78,7 +78,6 @@ DEPS=(
     python3-ply
     python3-pycparser
     python3-yaml
-    rust-packaging
     spirv-tools-devel
     spirv-llvm-translator-devel
     vulkan-headers
@@ -104,6 +103,8 @@ rm -rf $XORGMACROS_VERSION
 
 . .gitlab-ci/container/install-meson.sh
 
+. .gitlab-ci/container/build-rust.sh
+
 . .gitlab-ci/container/build-bindgen.sh
 
 . .gitlab-ci/container/build-mold.sh
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index ffd84eae1be..b9fd57c0d2a 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -32,7 +32,7 @@ variables:
   ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
   ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250814-trixie"
 
-  FEDORA_X86_64_BUILD_TAG: "20250811-vdpau"
+  FEDORA_X86_64_BUILD_TAG: "20250917-rust"
 
   KERNEL_TAG: "v6.16-mesa-9d85"
   KERNEL_REPO: "gfx-ci/linux"