diff options
| author | Christoph Reiter <creiter@src.gnome.org> | 2018-05-01 08:55:29 +0200 |
|---|---|---|
| committer | Philip Withnall <withnall@endlessm.com> | 2018-05-02 11:09:25 +0100 |
| commit | e8798a4c223a6c12c6a1094303c09a201847a9a0 (patch) | |
| tree | 567bc31a8e177a16de138e58d83c48dd54f8fcfb | |
| parent | a0c7f85437093b073b3e3b2c9cb337065b6ea896 (diff) | |
| download | glib-e8798a4c223a6c12c6a1094303c09a201847a9a0.tar.gz | |
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
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 6 | ||||
| -rwxr-xr-x | .gitlab-ci/test-msys2.sh | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 112a9d4c5..ef78ce5f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: ebassi/gitlab-glib:latest +image: registry.gitlab.gnome.org/gnome/glib/master:v1 stages: - build diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 940456fad..4fc59a1d6 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -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 diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index 44b32e654..4b09b0210 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -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 |