From da1e917b38728d329be5c84b13be1f35b82f5870 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 3 May 2019 14:02:27 -0300 Subject: [PATCH] ci: Add GNOME Shell dependencies to Dockerfile Embrace, extend and (soon) extinguish GNOME Shell's CI image. https://gitlab.gnome.org/GNOME/mutter/merge_requests/548 --- .gitlab-ci/Dockerfile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index dafa5ac24..f9e2ac937 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -2,16 +2,25 @@ FROM fedora:29 RUN dnf -y update && dnf -y upgrade && \ dnf install -y 'dnf-command(builddep)' && \ + dnf install -y 'dnf-command(copr)' && \ + dnf copr enable -y fmuellner/gnome-shell-ci && \ + dnf builddep -y mutter && \ # Until Fedora catches up with meson build-deps dnf install -y meson xorg-x11-server-Xorg gnome-settings-daemon-devel egl-wayland-devel xorg-x11-server-Xwayland && \ # For running unit tests - dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 && \ + dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 '*/xvfb-run' gdm-lib accountsservice-libs && \ # Unpackaged versions dnf install -y https://copr-be.cloud.fedoraproject.org/results/jadahl/mutter-ci/fedora-29-x86_64/00848426-gsettings-desktop-schemas/gsettings-desktop-schemas-3.30.1-1.20181206git918efdd69be53.fc29.x86_64.rpm https://copr-be.cloud.fedoraproject.org/results/jadahl/mutter-ci/fedora-29-x86_64/00848426-gsettings-desktop-schemas/gsettings-desktop-schemas-devel-3.30.1-1.20181206git918efdd69be53.fc29.x86_64.rpm && \ dnf install -y intltool redhat-rpm-config make && \ + + # GNOME Shell + dnf builddep -y gnome-shell --setopt=install_weak_deps=False && \ + dnf remove -y gnome-bluetooth-libs-devel dbus-glib-devel upower-devel python3-devel && \ + dnf remove -y --noautoremove mutter mutter-devel && \ + dnf clean all