diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2022-01-11 16:02:57 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2022-01-11 16:02:57 +0000 |
| commit | 4979fb4aaa5771c7d90a12325bc38f45f9641e51 (patch) | |
| tree | 3679034aa71d2b5d2dc884efb76b1dd388ccfcce | |
| parent | c5038e542fe9abf878da13812f229372b5fdcf92 (diff) | |
| download | gobject-introspection-4979fb4aaa5771c7d90a12325bc38f45f9641e51.tar.gz | |
ci: Update the installed version of Meson
| -rw-r--r-- | .gitlab-ci/Dockerfile | 2 | ||||
| -rw-r--r-- | .gitlab-ci/minimal.Dockerfile | 2 | ||||
| -rw-r--r-- | .gitlab-ci/test-msvc.bat | 2 | ||||
| -rw-r--r-- | .gitlab-ci/test-msys2-meson.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index bab05281..c1cbd258 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.55.3 +RUN pip3 install meson==0.58.2 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/minimal.Dockerfile b/.gitlab-ci/minimal.Dockerfile index d9a31995..88d9e590 100644 --- a/.gitlab-ci/minimal.Dockerfile +++ b/.gitlab-ci/minimal.Dockerfile @@ -16,7 +16,7 @@ RUN dnf -y install \ python3-wheel \ && dnf clean all -RUN pip3 install meson==0.55.3 +RUN pip3 install meson==0.58.2 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 0a6ba1a2..e2885a4a 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -9,7 +9,7 @@ py -3 -c "import urllib.request, sys; urllib.request.urlretrieve(*sys.argv[1:])" SET PATH=%CD%;%CD%\win_flex_bison;%PATH% -pip3 install --upgrade --user meson==0.55.3 || goto :error +pip3 install --upgrade --user meson==0.58.2 || goto :error meson subprojects download glib meson wrap promote subprojects\glib\subprojects\pcre.wrap diff --git a/.gitlab-ci/test-msys2-meson.sh b/.gitlab-ci/test-msys2-meson.sh index ead7bf7b..5f1d507c 100644 --- a/.gitlab-ci/test-msys2-meson.sh +++ b/.gitlab-ci/test-msys2-meson.sh @@ -30,7 +30,7 @@ pacman --noconfirm -S --needed \ export CCACHE_BASEDIR="${CI_PROJECT_DIR}" export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" -pip3 install --upgrade --user meson==0.55.3 flake8 mypy==0.790 +pip3 install --upgrade --user meson==0.58.2 flake8 mypy==0.790 export PATH="$HOME/.local/bin:$PATH" export CFLAGS="-Werror" |