From cb633f5fc385c84b393d93ae63d68c34c38cf870 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 2 Jun 2021 11:58:32 +0100
Subject: Use slightly less ancient Meson

---
 .gitlab-ci/Dockerfile          | 2 +-
 .gitlab-ci/minimal.Dockerfile  | 2 +-
 .gitlab-ci/test-msvc.bat       | 6 +++---
 .gitlab-ci/test-msys2-meson.sh | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to '.gitlab-ci')

diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 61e1b301..7f640b56 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -49,7 +49,7 @@ RUN dnf -y install \
     zlib-devel \
  && dnf clean all
 
-RUN pip3 install meson==0.50.1
+RUN pip3 install meson==0.55.3
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
diff --git a/.gitlab-ci/minimal.Dockerfile b/.gitlab-ci/minimal.Dockerfile
index 6f01faea..875c3e21 100644
--- a/.gitlab-ci/minimal.Dockerfile
+++ b/.gitlab-ci/minimal.Dockerfile
@@ -15,7 +15,7 @@ RUN dnf -y install \
     libmount-devel \
  && dnf clean all
 
-RUN pip3 install meson==0.52.0
+RUN pip3 install meson==0.55.3
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index 549d4fd1..18a69c1c 100644
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -9,10 +9,10 @@ py -3 -c "import urllib.request, sys; urllib.request.urlretrieve(*sys.argv[1:])"
 
 SET PATH=%CD%;%CD%\win_flex_bison;%PATH%
 
-pip3 install --upgrade --user meson==0.50.1 || goto :error
-meson _build || goto :error
-ninja -C _build || goto :error
+pip3 install --upgrade --user meson==0.55.3 || goto :error
 
+meson setup _build || goto :error
+meson compile -C _build || goto :error
 meson test -C _build --suite=gobject-introspection || goto :error
 
 goto :EOF
diff --git a/.gitlab-ci/test-msys2-meson.sh b/.gitlab-ci/test-msys2-meson.sh
index 96b393ac..ead7bf7b 100644
--- a/.gitlab-ci/test-msys2-meson.sh
+++ b/.gitlab-ci/test-msys2-meson.sh
@@ -30,7 +30,7 @@ pacman --noconfirm -S --needed \
 export CCACHE_BASEDIR="${CI_PROJECT_DIR}"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 
-pip3 install --upgrade --user meson==0.50.1 flake8 mypy==0.790
+pip3 install --upgrade --user meson==0.55.3 flake8 mypy==0.790
 export PATH="$HOME/.local/bin:$PATH"
 
 export CFLAGS="-Werror"
-- 
cgit v1.2.1