[gobject-introspection/ebassi/glib-update] ci: Update MSYS2 test

[Emmanuele Bassi <ebassi src gnome org>]

commit b20205170f5656b3d0aa3cbc3cee8a3c0f54233d
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Jul 13 14:42:54 2022 +0100

    ci: Update MSYS2 test
    
    - Install pcre2, as it's a new GLib dependency.
    - Do not use CFLAGS to inject -Werror
    - Use idiomatic Meson subcommands

 .gitlab-ci/test-msys2-meson.sh | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci/test-msys2-meson.sh b/.gitlab-ci/test-msys2-meson.sh
index 6ee79488..c61efcde 100644
--- a/.gitlab-ci/test-msys2-meson.sh
+++ b/.gitlab-ci/test-msys2-meson.sh
@@ -23,7 +23,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-libffi \
     mingw-w64-$MSYS2_ARCH-pkg-config \
     mingw-w64-$MSYS2_ARCH-cairo \
-    mingw-w64-$MSYS2_ARCH-pcre \
+    mingw-w64-$MSYS2_ARCH-pcre2 \
     mingw-w64-$MSYS2_ARCH-zlib \
     mingw-w64-$MSYS2_ARCH-gettext
 
@@ -33,13 +33,21 @@ export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 pip3 install --upgrade --user meson==0.60 flake8 mypy==0.931 types-Markdown
 export PATH="$HOME/.local/bin:$PATH"
 
-export CFLAGS="-Werror"
-meson -Dcairo=enabled -Ddoctool=enabled --buildtype debug _build
-cd _build
-ninja
-
-meson test --print-errorlogs --suite=gobject-introspection --no-suite=glib
-cd ..
+meson setup \
+        -Dwerror=true \
+        -Dglib:werror=false \
+        -Dcairo=enabled \
+        -Ddoctool=enabled \
+        --buildtype debug \
+        _build
+
+meson compile -C _build
+
+meson test \
+        --print-errorlogs \
+        --suite=gobject-introspection \
+        --no-suite=glib \
+        -C _build
 
 python3 -m flake8 --count
 python3 -m mypy _build