diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-07-11 08:55:06 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-07-11 08:55:06 +0200 |
| commit | bd2054a127de9244bc05c4e170a014dd224507e8 (patch) | |
| tree | dde006af6203b036bb45878b6a8052d94dee63b5 /.gitlab-ci | |
| parent | a2cc19a847cf765b3fbc3fb51de4bfde2e0ba4cf (diff) | |
| download | gobject-introspection-bd2054a127de9244bc05c4e170a014dd224507e8.tar.gz | |
ci: Update meson to 0.47.1 for glib
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 2 | ||||
| -rw-r--r-- | .gitlab-ci/test-msys2.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 876ec3d1..8b13de05 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -41,7 +41,7 @@ RUN dnf -y install \ zlib-devel \ && dnf clean all -RUN pip3 install meson==0.46.1 +RUN pip3 install meson==0.47.1 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index ad3402b4..ef69fe8f 100644 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -18,6 +18,7 @@ pacman --noconfirm -S --needed \ mingw-w64-$MSYS2_ARCH-ccache \ mingw-w64-$MSYS2_ARCH-meson \ mingw-w64-$MSYS2_ARCH-python3 \ + mingw-w64-$MSYS2_ARCH-python3-pip \ mingw-w64-$MSYS2_ARCH-libffi \ mingw-w64-$MSYS2_ARCH-pkg-config \ mingw-w64-$MSYS2_ARCH-cairo \ @@ -28,6 +29,9 @@ pacman --noconfirm -S --needed \ export CCACHE_BASEDIR="${CI_PROJECT_DIR}" export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" +pip3 install --upgrade --user meson==0.47.1 +export PATH="$HOME/.local/bin:$PATH" + meson --buildtype debug _build cd _build ninja |