From 2d80240220ce272450e9ce5df3307f818a6e5fdb Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Mon, 11 Dec 2023 13:57:18 +0100
Subject: [PATCH] ci/fedora: bump to meson 1.3.0

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

diff --git a/.gitlab-ci/container/fedora/x86_64_build.sh b/.gitlab-ci/container/fedora/x86_64_build.sh
index 56e127ec320..38ef6be6dc2 100644
--- a/.gitlab-ci/container/fedora/x86_64_build.sh
+++ b/.gitlab-ci/container/fedora/x86_64_build.sh
@@ -96,8 +96,8 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
 cd $XORGMACROS_VERSION; ./configure; make install; cd ..
 rm -rf $XORGMACROS_VERSION
 
-# We need at least 1.2 for Rust's `debug_assertions`
-pip install meson==1.2.0
+# We need at least 1.3 for meson's rust.proc_macro
+pip install meson==1.3.0
 
 . .gitlab-ci/container/build-mold.sh
 
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 6f7b576dd33..403c32b3c8e 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -24,7 +24,7 @@ variables:
 
    ALPINE_X86_64_BUILD_TAG: "2023-10-30-ci-improv"
    ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
-   FEDORA_X86_64_BUILD_TAG: "2023-10-30-ci-improv"
+   FEDORA_X86_64_BUILD_TAG: "2023-12-11-meson-bump"
    KERNEL_ROOTFS_TAG: "2023-12-08-firmware"
    KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
    KERNEL_REPO: "gfx-ci/linux"