summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2019-07-26 18:49:46 +0200
committerChristoph Reiter <reiter.christoph@gmail.com>2019-07-26 18:18:23 +0000
commitd2b675f45a96554f2510ddf749ea182c10d2664d (patch)
tree9b64f79a4cb296fc53abdab1898d54e74b6233a1 /.gitlab-ci
parente8ba84091eadbe1b0edabf9ec276f00651729aa7 (diff)
downloadgobject-introspection-d2b675f45a96554f2510ddf749ea182c10d2664d.tar.gz
meson: require 0.49.2
It's what we use for testing in CI (so not even sure older versions work) and glib master now also depends on this 0.49.
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/Dockerfile2
-rw-r--r--.gitlab-ci/test-msvc.bat2
-rw-r--r--.gitlab-ci/test-msys2-meson.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index dd7a0ccc..0d9d4268 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -48,7 +48,7 @@ RUN dnf -y install \
zlib-devel \
&& dnf clean all
-RUN pip3 install meson==0.49.0
+RUN pip3 install meson==0.49.2
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 1fc4d1d2..b30bae5e 100644
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -9,7 +9,7 @@ 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.49.0 || goto :error
+pip3 install --upgrade --user meson==0.49.2 || goto :error
meson _build || goto :error
ninja -C _build || goto :error
diff --git a/.gitlab-ci/test-msys2-meson.sh b/.gitlab-ci/test-msys2-meson.sh
index 7c63581c..ce1768c4 100644
--- a/.gitlab-ci/test-msys2-meson.sh
+++ b/.gitlab-ci/test-msys2-meson.sh
@@ -31,7 +31,7 @@ pacman --noconfirm -S --needed \
export CCACHE_BASEDIR="${CI_PROJECT_DIR}"
export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-pip3 install --upgrade --user meson==0.49.0 flake8
+pip3 install --upgrade --user meson==0.49.2 flake8
export PATH="$HOME/.local/bin:$PATH"
# FIXME: https://github.com/Alexpux/MINGW-packages/pull/4064