summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorChristoph Reiter <creiter@src.gnome.org>2019-03-28 22:47:18 +0100
committerChristoph Reiter <creiter@src.gnome.org>2019-03-28 22:47:18 +0100
commit80c26ab9045030b51e00117dccbbd85313e2cf7a (patch)
treeec43c3a7403d02e33e22a28a3e9736076880a027 /.gitlab-ci
parentf0845d98a21a7a5c5817d50f2076dd2615e3979b (diff)
downloadgtk+-80c26ab9045030b51e00117dccbbd85313e2cf7a.tar.gz
CI: install meson 0.50
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/Dockerfile2
-rwxr-xr-x.gitlab-ci/run-docker.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 051bd9da4c..a2866c5fac 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -70,7 +70,7 @@ RUN dnf -y install \
xorg-x11-server-Xvfb \
&& dnf clean all
-RUN pip3 install meson==0.49.0
+RUN pip3 install meson==0.50.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 1fba076bd9..4b103b09a7 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/gtk/master:v2"
+TAG="registry.gitlab.gnome.org/gnome/gtk/master:v3"
sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .