From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sun, 22 May 2022 09:38:14 +0000 (+0200)
Subject: CI: bump meson version from 0.59 to 0.60.3
X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~20^2~4^2~172^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f695388e9ea90775dfef6b8020b6312e191bc4e;p=gtk4.git

CI: bump meson version from 0.59 to 0.60.3

We pull in glib main via a submodule in CI and glib has recently
bumped its meson requirement to >= 0.60:
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2641

Install 0.60.3 where needed to make things build again.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7dccd22275..c2a742d86b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,7 +173,7 @@ macos:
   needs: []
   before_script:
     - bash .gitlab-ci/show-info-osx.sh
-    - pip3 install --user meson==0.59
+    - pip3 install --user meson==0.60.3
     - pip3 install --user ninja
     - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
     - export MESON_FORCE_BACKTRACE=1
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index a3ac0a4719..cf8d9b130c 100644
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -5,7 +5,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar
 @echo on
 
 :: FIXME: make warnings fatal
-pip3 install --upgrade --user meson==0.59 || goto :error
+pip3 install --upgrade --user meson==0.60.3 || goto :error
 meson -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
 ninja -C _build || goto :error