diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-06-16 11:45:09 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-06-16 11:45:09 +0200 |
| commit | 06660d70e1899d9ad9b3c951073fb9a13652da9d (patch) | |
| tree | 91406e13193906e6ad85cda38f0d60642acfaee5 /.gitlab-ci | |
| parent | ce0353c25707ee5f200a72a259b6c55b0691382e (diff) | |
| download | gobject-introspection-06660d70e1899d9ad9b3c951073fb9a13652da9d.tar.gz | |
ci: Update meson to 0.46.1
glib now requires 0.46.1 and GI uses it as a subproject in CI
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 5a7a9815..876ec3d1 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -41,7 +41,7 @@ RUN dnf -y install \ zlib-devel \ && dnf clean all -RUN pip3 install meson +RUN pip3 install meson==0.46.1 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 91694fb3..77eff633 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-gi" \ +TAG="registry.gitlab.gnome.org/gnome/gobject-introspection: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-gi" bash + --tty --interactive "${TAG}" bash |