From 6286e5774be63a222ae3d58955a20f86cf8b3829 Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@gnome.org>
Date: Thu, 15 Feb 2024 21:21:52 +0000
Subject: [PATCH] ci: Use Meson version from pacman on msys2 CI runners
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rather than pinning it to the lowest version we support, as is the
standard policy.

This means we’ll end up using version 1.3.2-2, which has just been
packaged to contain the fix for
https://github.com/mesonbuild/meson/issues/12330, which has been
impacting GLib significantly since we started installing
gobject-introspection in CI in commit
c428d6e67318e7b02c13111db260ed98622e982a.

Thanks to Christoph Reiter, Luca Bacci and Simon McVittie for diagnosing
and fixing this issue.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Fixes: #3262
---
 .gitlab-ci/test-msys2.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index b5a6d9adb..98bd00ca8 100755
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -29,7 +29,7 @@ CCACHE_BASEDIR="$(pwd)"
 CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 export CCACHE_BASEDIR CCACHE_DIR
 
-pip3 install --upgrade --user meson==1.2.3 packaging==23.2
+pip3 install --upgrade --user packaging==23.2
 
 PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH"
 DIR="$(pwd)"