From 1bdce46399b47106e9901a2c0ae38be1163aa08e Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 5 May 2022 19:23:20 +0100 Subject: [PATCH] build: Bump Meson dependency to 0.60.0 As per the new policy in `docs/meson-version.md`, we can now bump the dependency. Signed-off-by: Philip Withnall --- .gitlab-ci/android-ndk.Dockerfile | 2 +- .gitlab-ci/debian-stable.Dockerfile | 2 +- .gitlab-ci/fedora.Dockerfile | 2 +- .gitlab-ci/mingw.Dockerfile | 2 +- .gitlab-ci/test-msvc.bat | 2 +- .gitlab-ci/test-msys2.sh | 2 +- meson.build | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/android-ndk.Dockerfile b/.gitlab-ci/android-ndk.Dockerfile index 1ea3622e7..0b410d42d 100644 --- a/.gitlab-ci/android-ndk.Dockerfile +++ b/.gitlab-ci/android-ndk.Dockerfile @@ -72,7 +72,7 @@ RUN rm -rf \ $ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory \ $ANDROID_NDK_PATH -RUN pip3 install meson==0.52.0 +RUN pip3 install meson==0.60.3 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 84aa98ba2..fc7031271 100644 --- a/.gitlab-ci/debian-stable.Dockerfile +++ b/.gitlab-ci/debian-stable.Dockerfile @@ -65,7 +65,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.52.0 +RUN pip3 install meson==0.60.3 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index deaa7c74e..f00751879 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -73,7 +73,7 @@ RUN dnf -y update \ make \ && dnf clean all -RUN pip3 install meson==0.52.1 +RUN pip3 install meson==0.60.3 # Set /etc/machine-id as it’s needed for some D-Bus tests RUN systemd-machine-id-setup diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile index eb773e0f1..904fc1211 100644 --- a/.gitlab-ci/mingw.Dockerfile +++ b/.gitlab-ci/mingw.Dockerfile @@ -57,7 +57,7 @@ RUN dnf -y install \ WORKDIR /opt COPY cross_file_mingw64.txt /opt -RUN pip3 install meson==0.52.0 +RUN pip3 install meson==0.60.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 1a6924bd2..55bc71bf2 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -12,7 +12,7 @@ for %%x in (%*) do ( set args=%args:~1% :: FIXME: make warnings fatal -pip3 install --upgrade --user meson==0.52.0 || goto :error +pip3 install --upgrade --user meson==0.60.3 || goto :error meson %args% _build || goto :error ninja -C _build || goto :error diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index ace412373..fbfbbcdcf 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.52.0 +pip3 install --upgrade --user meson==0.60.3 PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH" CFLAGS="-coverage -ftest-coverage -fprofile-arcs" diff --git a/meson.build b/meson.build index a1676a28c..1d5abc1a3 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('glib', 'c', 'cpp', version : '2.73.0', # NOTE: See the policy in docs/meson-version.md before changing the Meson dependency - meson_version : '>= 0.52.0', + meson_version : '>= 0.60.0', default_options : [ 'buildtype=debugoptimized', 'warning_level=3',