[gobject-introspection] ci: Update meson to 0.46.1



commit 06660d70e1899d9ad9b3c951073fb9a13652da9d
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Sat Jun 16 11:45:09 2018 +0200

    ci: Update meson to 0.46.1
    
    glib now requires 0.46.1 and GI uses it as a subproject in CI

 .gitlab-ci/Dockerfile    | 2 +-
 .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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]