diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2019-01-02 19:43:05 +0100 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2019-01-02 19:43:05 +0100 |
| commit | a5af67755ce9aaaf8ab0461899e68fd7a55dbc52 (patch) | |
| tree | 78b9f54cffcb6be8162915c9387ec83b2e1be80e | |
| parent | 4fe2fe6e23287154ca953a031ba2dffd3c853648 (diff) | |
| download | gobject-introspection-a5af67755ce9aaaf8ab0461899e68fd7a55dbc52.tar.gz | |
ci: update meson to 0.49.0
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/test-msvc.bat | 2 | ||||
| -rw-r--r-- | .gitlab-ci/test-msys2-meson.sh | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53abbde7..469dbc21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - build - deploy -image: registry.gitlab.gnome.org/gnome/gobject-introspection:v3 +image: registry.gitlab.gnome.org/gnome/gobject-introspection:v4 cache: paths: diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index cac13eb0..0330e3af 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -47,7 +47,7 @@ RUN dnf -y install \ zlib-devel \ && dnf clean all -RUN pip3 install meson==0.48.2 +RUN pip3 install meson==0.49.0 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index a087927c..ef014646 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v3" +TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v4" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index cb916801..461d1e5c 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.48.2 || goto :error +pip3 install --upgrade --user meson==0.49.0 || goto :error meson _build || goto :error ninja -C _build || goto :error diff --git a/.gitlab-ci/test-msys2-meson.sh b/.gitlab-ci/test-msys2-meson.sh index 52c31814..daeca63a 100644 --- a/.gitlab-ci/test-msys2-meson.sh +++ b/.gitlab-ci/test-msys2-meson.sh @@ -31,7 +31,7 @@ pacman --noconfirm -S --needed \ export CCACHE_BASEDIR="${CI_PROJECT_DIR}" export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" -pip3 install --upgrade --user meson==0.48.2 flake8 +pip3 install --upgrade --user meson==0.49.0 flake8 export PATH="$HOME/.local/bin:$PATH" # FIXME: https://github.com/Alexpux/MINGW-packages/pull/4064 |