diff options
| author | Philip Chimento <philip.chimento@gmail.com> | 2018-09-29 23:50:13 -0700 |
|---|---|---|
| committer | Philip Chimento <philip.chimento@gmail.com> | 2018-09-29 23:53:01 -0700 |
| commit | 842cd5ecca7c7d67c288c7e35b083c589c9c9ac8 (patch) | |
| tree | 1c3aa8d98a015547cc0a7e5190b7d1d378d73351 /.gitlab-ci | |
| parent | 620b022535c29a30f55c8af36a98f209445cb41b (diff) | |
| download | gobject-introspection-842cd5ecca7c7d67c288c7e35b083c589c9c9ac8.tar.gz | |
CI: Upgrade Meson version
GLib, a wrapped dependency, requires 0.48.0, so our CI environments should
have that installed.
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 2 | ||||
| -rw-r--r-- | .gitlab-ci/test-msvc.bat | 2 | ||||
| -rw-r--r-- | .gitlab-ci/test-msys2.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 5c291a8c..bb770eac 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -51,7 +51,7 @@ RUN dnf -y install \ zlib-devel \ && dnf clean all -RUN pip3 install meson==0.47.1 +RUN pip3 install meson==0.48.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 6812f942..1d80590b 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -10,7 +10,7 @@ py -3 -m zipfile -e pkg-config-lite-0.28-1.zip . SET PATH=%CD%\pkg-config-lite-0.28-1\bin;%CD%\win_flex_bison;%PATH% -pip3 install --upgrade --user meson==0.47.1 || goto :error +pip3 install --upgrade --user meson==0.48.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 b51d0876..478eee91 100644 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -29,7 +29,7 @@ pacman --noconfirm -S --needed \ export CCACHE_BASEDIR="${CI_PROJECT_DIR}" export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" -pip3 install --upgrade --user meson==0.47.1 flake8 +pip3 install --upgrade --user meson==0.48.0 flake8 export PATH="$HOME/.local/bin:$PATH" # FIXME: https://github.com/Alexpux/MINGW-packages/pull/4064 |