From f8e19243551a2260fcbccd1eea575afae67b9228 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 29 Mar 2018 09:48:29 +0100 Subject: [PATCH] ci: Manually install Meson from PyPI 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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index f4c97c99d4..eaa0e6153d 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -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} -- 2.30.2