From 40a76590dd821cc10af0ab2621f2f4b84a9a861e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 29 Oct 2019 00:50:07 +0100 Subject: [PATCH] ci: Update docker image to v3 It's this time of the cycle again: Rebase the docker image to the upcoming Fedora release, so we can drop a fair bit of the custom dependencies that have piled up. https://gitlab.gnome.org/GNOME/mutter/merge_requests/894 --- .gitlab-ci.yml | 2 +- .gitlab-ci/Dockerfile | 21 +++++---------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48c5675bb..ea2ad98c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.gnome.org/gnome/mutter/master:v2 +image: registry.gitlab.gnome.org/gnome/mutter/master:v3 stages: - review diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 2acacc1ac..653298976 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,39 +1,28 @@ # Rebuild and push with # # cd .gitlab-ci/ -# docker build --no-cache -t registry.gitlab.gnome.org/gnome/mutter/master:v2 . -# docker push registry.gitlab.gnome.org/gnome/mutter/master:v2 +# docker build --no-cache -t registry.gitlab.gnome.org/gnome/mutter/master:v3 . +# docker push registry.gitlab.gnome.org/gnome/mutter/master:v3 # -FROM fedora:30 +FROM fedora:31 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 copr enable -y jadahl/mutter-ci && \ - dnf copr enable -y hergertme/sysprof-3 && \ dnf -y update && dnf -y upgrade && \ 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 graphene-devel && \ - - # Until Fedora catches up with mesa bug fixes - dnf upgrade -y mesa-dri-drivers mesa-libEGL && \ + # Until Fedora catches up with new build-deps + dnf install -y 'pkgconfig(graphene-gobject-1.0)' 'pkgconfig(sysprof-capture-3)' && \ # For running unit tests dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 '*/xvfb-run' gdm-lib accountsservice-libs && \ - dnf install -y sysprof-devel && \ - - dnf install -y intltool redhat-rpm-config make && \ - # GNOME Shell dnf builddep -y gnome-shell --setopt=install_weak_deps=False && \ - # New dep this cycle - dnf install -y 'pkgconfig(gnome-autoar-0)' && \ dnf remove -y gnome-bluetooth-libs-devel dbus-glib-devel upower-devel python3-devel && \ dnf remove -y --noautoremove mutter mutter-devel && \