luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-09 19:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: Bump Meson dependency to 0.60.0

Browse Source 
As per the new policy in `docs/meson-version.md`, we can now bump the
dependency.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-05-05 19:23:20 +01:00
parent 91c50c2927
commit 1bdce46399
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/android-ndk.Dockerfile
View File

@ -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}

2
.gitlab-ci/debian-stable.Dockerfile
View File

@ -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}

2
.gitlab-ci/fedora.Dockerfile
View File

@ -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

2
.gitlab-ci/mingw.Dockerfile
View File

@ -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}

2
.gitlab-ci/test-msvc.bat
View File

@ -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

2
.gitlab-ci/test-msys2.sh
View File

@ -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"

2
meson.build
View File

@ -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',