diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2020-04-24 11:53:19 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2020-04-24 11:53:19 +0100 |
| commit | ec08670d80d12668e3e6be4b6eb395e5ad207034 (patch) | |
| tree | 3561821b695febc6938460b2c96a75ddbb62137f /.gitlab-ci | |
| parent | 42b7d634a9a7500dcc71651f71844148fc200be3 (diff) | |
| download | gobject-introspection-ec08670d80d12668e3e6be4b6eb395e5ad207034.tar.gz | |
Revert "Meson: Override gobject-introspection-1.0 dependency"
This reverts commit d01a387475e2665275a6cd6b0059bf91121b8300.
The nightly run time does not have Meson 0.54
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 2 | ||||
| -rw-r--r-- | .gitlab-ci/minimal.Dockerfile | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker-minimal.sh | 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 |
6 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 61c5fe41..0dec6700 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -48,7 +48,7 @@ RUN dnf -y install \ zlib-devel \ && dnf clean all -RUN pip3 install meson==0.54.0 +RUN pip3 install meson==0.50.1 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 e4d1f821..b33aa64b 100644 --- a/.gitlab-ci/minimal.Dockerfile +++ b/.gitlab-ci/minimal.Dockerfile @@ -15,7 +15,7 @@ RUN dnf -y install \ libmount-devel \ && dnf clean all -RUN pip3 install meson==0.54.0 +RUN pip3 install meson==0.52.0 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/run-docker-minimal.sh b/.gitlab-ci/run-docker-minimal.sh index 9588f288..36b2d376 100755 --- a/.gitlab-ci/run-docker-minimal.sh +++ b/.gitlab-ci/run-docker-minimal.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:min-v2" +TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:min-v1" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "minimal.Dockerfile" . diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 8e6a04ab..5d29002c 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:v7" +TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v6" 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 d8eaa776..a2ee44b2 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.54.0 || goto :error +pip3 install --upgrade --user meson==0.50.1 || 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 9c607b29..9f145e5b 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.54.0 flake8 +pip3 install --upgrade --user meson==0.50.1 flake8 export PATH="$HOME/.local/bin:$PATH" export CFLAGS="-Werror" |