diff options
| author | Philip Withnall <pwithnall@endlessos.org> | 2021-10-07 17:05:12 +0100 |
|---|---|---|
| committer | Philip Withnall <pwithnall@endlessos.org> | 2021-10-07 17:15:13 +0100 |
| commit | 46588698e24e0c8eede177d4b71b96e18a78da5d (patch) | |
| tree | e59f25d9a7a672d085a14d454e20b3cf931d0022 /.gitlab-ci | |
| parent | a4c9049486868f9a08c74e745733a502b9ca9071 (diff) | |
| download | glib-46588698e24e0c8eede177d4b71b96e18a78da5d.tar.gz | |
build: Bump Meson dependency to 0.52.0
This is what’s available in the new Debian Stable, so we can expect it
to be available pretty much everywhere.
Subsequent commits will clean up old workarounds.
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/android-ndk.Dockerfile | 2 | ||||
| -rw-r--r-- | .gitlab-ci/debian-stable.Dockerfile | 2 | ||||
| -rw-r--r-- | .gitlab-ci/mingw.Dockerfile | 2 | ||||
| -rw-r--r-- | .gitlab-ci/test-msvc.bat | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/test-msys2.sh | 2 |
5 files changed, 5 insertions, 5 deletions
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" |