diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c990675f..6abbc461d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -441,7 +441,7 @@ macos: needs: [] before_script: - bash .gitlab-ci/show-execution-environment.sh - - pip3 install --user meson==0.49.2 + - pip3 install --user meson==0.52.0 - pip3 install --user ninja - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH script: diff --git a/.gitlab-ci/android-ndk.Dockerfile b/.gitlab-ci/android-ndk.Dockerfile index 8bcedfe62..0931ee203 100644 --- a/.gitlab-ci/android-ndk.Dockerfile +++ b/.gitlab-ci/android-ndk.Dockerfile @@ -64,7 +64,7 @@ RUN ./android-setup-env.sh arm64 21 RUN ./android-setup-env.sh arm64 28 RUN rm -rf $ANDROID_NDK_PATH -RUN pip3 install meson==0.49.2 +RUN pip3 install meson==0.52.0 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile index 19621a749..224003ba0 100644 --- a/.gitlab-ci/debian-stable.Dockerfile +++ b/.gitlab-ci/debian-stable.Dockerfile @@ -66,7 +66,7 @@ RUN locale-gen de_DE.UTF-8 \ ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8 -RUN pip3 install meson==0.49.2 +RUN pip3 install meson==0.52.0 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile index 6691c8618..293d91a5d 100644 --- a/.gitlab-ci/mingw.Dockerfile +++ b/.gitlab-ci/mingw.Dockerfile @@ -58,7 +58,7 @@ RUN dnf -y install \ WORKDIR /opt COPY cross_file_mingw64.txt /opt -RUN pip3 install meson==0.49.2 +RUN pip3 install meson==0.52.0 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 6cc6d80ca..aeb09664f 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.49.2 || goto :error +pip3 install --upgrade --user meson==0.52.0 || goto :error meson _build || goto :error ninja -C _build || goto :error diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index 1950443d8..0d1815593 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -31,7 +31,7 @@ CCACHE_BASEDIR="$(pwd)" CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" export CCACHE_BASEDIR CCACHE_DIR -pip3 install --upgrade --user meson==0.49.2 +pip3 install --upgrade --user meson==0.52.0 PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH" CFLAGS="-coverage -ftest-coverage -fprofile-arcs" diff --git a/meson.build b/meson.build index a51f42f0a..dd5b20b9d 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('glib', 'c', 'cpp', version : '2.71.0', - # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships - meson_version : '>= 0.49.2', + # NOTE: We keep this pinned at 0.52 because that's what Debian Stable ships + meson_version : '>= 0.52.0', default_options : [ 'buildtype=debugoptimized', 'warning_level=1',