From f5618315f177e3006ae22485edc243ec97ab55a5 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Thu, 24 Oct 2024 14:03:05 +0100
Subject: [PATCH] ci/fedora: Install which into build image

We use this for a bunch of stuff, so make sure it's installed. Also make
sure the package list remains strictly in alphabetical order.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33137>
---
 .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 3921e2dfea1..82b138cf88e 100644
--- a/.gitlab-ci/container/fedora/x86_64_build.sh
+++ b/.gitlab-ci/container/fedora/x86_64_build.sh
@@ -82,9 +82,10 @@ DEPS=(
     python3-pycparser
     python3-yaml
     rust-packaging
-    vulkan-headers
     spirv-tools-devel
     spirv-llvm-translator-devel
+    vulkan-headers
+    which
 )
 
 dnf install -y --setopt=install_weak_deps=False "${DEPS[@]}" "${EPHEMERAL[@]}"
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index cd549cd1252..ffa203b0d8a 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -37,7 +37,7 @@ variables:
 
    ALPINE_X86_64_BUILD_TAG: "20250124-spirv-tools"
    ALPINE_X86_64_LAVA_SSH_TAG: "20250124-spirv-tools"
-   FEDORA_X86_64_BUILD_TAG: "20241122-sections"
+   FEDORA_X86_64_BUILD_TAG: "20250125-which"
 
    KERNEL_TAG: "v6.13-rc4-mesa-5e77"
    KERNEL_REPO: "gfx-ci/linux"