ci: Manually install Meson from PyPI
authorEmmanuele Bassi <ebassi@gnome.org>
Thu, 29 Mar 2018 08:48:29 +0000 (09:48 +0100)
committerEmmanuele Bassi <ebassi@gnome.org>
Thu, 29 Mar 2018 10:37:30 +0000 (11:37 +0100)
The Fedora base image we use for our CI doesn't always keep Meson up to
date with our requirements, so it's better if we just install Meson via
Python's pip.

.gitlab-ci/Dockerfile

index f4c97c99d4b952b647249b044fe08d782926c226..eaa0e6153d3d9a53a0b65a50b987060ecf785b3c 100644 (file)
@@ -51,9 +51,12 @@ RUN dnf -y install \
     mesa-dri-drivers \
     mesa-libEGL-devel \
     mesa-libwayland-egl-devel \
-    meson \
+    ninja-build \
     pango-devel \
     pcre-devel \
+    python3 \
+    python3-pip \
+    python3-wheel \
     redhat-rpm-config \
     sassc \
     systemtap-sdt-devel \
@@ -61,7 +64,10 @@ RUN dnf -y install \
     wayland-devel \
     wayland-protocols-devel \
     which \
-    xorg-x11-server-Xvfb
+    xorg-x11-server-Xvfb \
+ && dnf clean all
+
+RUN pip3 install meson
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}