From 82dab8691e5d95d00139e27108d15c361e493a36 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Fri, 3 May 2024 17:17:04 +0200
Subject: [PATCH] ci: uprev mold to 2.31.0

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29043>
---
 .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 33d0d015a09..b97b5c2764f 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="2.4.1"
+MOLD_VERSION="2.31.0"
 
 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 7539d93295a..953dfdca2d3 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: "20240412-pycparser"
+   DEBIAN_BASE_TAG: "20240503-mold"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20240408-cbindgen"
+   DEBIAN_BUILD_TAG: "20240503-mold"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
 
@@ -27,11 +27,11 @@ variables:
    DEBIAN_X86_64_TEST_ANDROID_TAG: "20240423-deqp"
    DEBIAN_X86_64_TEST_GL_TAG: "20240428-piglit-7a"
    DEBIAN_X86_64_TEST_VK_TAG: "20240428-piglit-7a"
-   KERNEL_ROOTFS_TAG: "20240428-piglit-7a"
+   KERNEL_ROOTFS_TAG: "20240503-mold"
 
    ALPINE_X86_64_BUILD_TAG: "20240412-pycparser"
    ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"
-   FEDORA_X86_64_BUILD_TAG: "20240412-pycparser"
+   FEDORA_X86_64_BUILD_TAG: "20240503-mold"
    KERNEL_TAG: "v6.6.21-mesa-19fc"
    KERNEL_REPO: "gfx-ci/linux"
    PKG_REPO_REV: "3cc12a2a"