From 737342ef23cd14e8f910fa50795ff2b83f435785 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 20 Dec 2022 01:52:36 +0000 Subject: [PATCH] ci: Don't use builddep to install Wayland build dependencies We don't want to bring undefined dependencies into the image. Additionally, Wayland depends on Meson, and we don't want to use Fedora's version of Meson. --- .gitlab-ci/fedora.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 2f76b4f9d3..4b61ed0e9a 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -18,7 +18,9 @@ RUN dnf -y install \ dejavu-sans-mono-fonts \ desktop-file-utils \ diffutils \ + docbook-style-xsl \ elfutils-libelf-devel \ + expat-devel \ fribidi-devel \ gcc \ gcc-c++ \ @@ -31,6 +33,7 @@ RUN dnf -y install \ glibc-devel \ glibc-headers \ gnome-desktop-testing \ + gnupg2 \ gobject-introspection-devel \ graphene-devel \ graphviz \ @@ -70,7 +73,6 @@ RUN dnf -y install \ mesa-dri-drivers \ mesa-libEGL-devel \ mesa-libGLES-devel \ - meson \ ninja-build \ pango-devel \ pcre-devel \ @@ -93,8 +95,6 @@ RUN dnf -y install \ weston-libs \ which \ xorg-x11-server-Xvfb \ - && dnf install -y 'dnf-command(builddep)' \ - && dnf builddep -y wayland \ && dnf clean all # Enable sudo for wheel users -- 2.30.2