From 54cb45cc6c7b8f8a336629132b671a0d8a5ba472 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Fri, 1 Mar 2024 06:56:13 +0000
Subject: [PATCH] ci: uprev mold to the latest release

The mold version we've been using is very old by now, and we've
now encountered some mold bugs, so let's uprev it to see it things
work better now.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27905>
---
 .gitlab-ci/container/build-mold.sh | 2 +-
 .gitlab-ci/image-tags.yml          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci/container/build-mold.sh b/.gitlab-ci/container/build-mold.sh
index 1c3cfde8ac9..33d0d015a09 100644
--- a/.gitlab-ci/container/build-mold.sh
+++ b/.gitlab-ci/container/build-mold.sh
@@ -9,7 +9,7 @@ set -ex
 # FEDORA_X86_64_BUILD_TAG
 # KERNEL_ROOTFS_TAG
 
-MOLD_VERSION="1.11.0"
+MOLD_VERSION="2.4.1"
 
 git clone -b v"$MOLD_VERSION" --single-branch --depth 1 https://github.com/rui314/mold.git
 pushd mold
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 7bac33dc982..a1a0f807ac8 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -13,10 +13,10 @@
 
 variables:
    DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "20240208-libclc-9"
+   DEBIAN_BASE_TAG: "20240301-mold"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20240208-libclc-9"
+   DEBIAN_BUILD_TAG: "20240301-mold"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
 
@@ -29,8 +29,8 @@ variables:
    DEBIAN_X86_64_TEST_VK_TAG: "20240223-piglit-2a"
    ALPINE_X86_64_BUILD_TAG: "20240208-libclc-5"
    ALPINE_X86_64_LAVA_SSH_TAG: "20230626-v1"
-   FEDORA_X86_64_BUILD_TAG: "20240123-teflon-3"
-   KERNEL_ROOTFS_TAG: "20240223-piglit-2a"
+   FEDORA_X86_64_BUILD_TAG: "20240301-mold"
+   KERNEL_ROOTFS_TAG: "20240301-mold"
    KERNEL_TAG: "v6.6.16-mesa-475e"
    KERNEL_REPO: "gfx-ci/linux"
    PKG_REPO_REV: "3cc12a2a"