ci: update meson

Rebuild the fedora docker image to get the newest meson release and
use pip to install the newest version for MSYS2.

https://bugzilla.gnome.org/show_bug.cgi?id=795711
This commit is contained in:
Christoph Reiter 2018-05-01 08:55:29 +02:00 committed by Philip Withnall
parent a0c7f85437
commit e8798a4c22
3 changed files with 8 additions and 3 deletions

View File

@ -1,4 +1,4 @@
image: ebassi/gitlab-glib:latest
image: registry.gitlab.gnome.org/gnome/glib/master:v1
stages:
- build

View File

@ -2,8 +2,10 @@
set -e
sudo docker build --build-arg HOST_USER_ID="$UID" --tag "gitlab-glib" \
TAG="registry.gitlab.gnome.org/gnome/glib/master:v1"
sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .
sudo docker run --rm \
--volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
--tty --interactive "gitlab-glib" bash
--tty --interactive "${TAG}" bash

View File

@ -19,12 +19,15 @@ pacman --noconfirm -S --needed \
mingw-w64-$MSYS2_ARCH-meson \
mingw-w64-$MSYS2_ARCH-pcre \
mingw-w64-$MSYS2_ARCH-python3 \
mingw-w64-$MSYS2_ARCH-python3-pip \
mingw-w64-$MSYS2_ARCH-toolchain \
mingw-w64-$MSYS2_ARCH-zlib
mkdir -p _ccache
export CCACHE_BASEDIR="$(pwd)"
export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
pip3 install --upgrade --user meson
export PATH="$HOME/.local/bin:$PATH"
meson --werror --buildtype debug _build
cd _build