From 9c2fdcdbb2843573ba81a64c5d0ba30961c1a30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 17 May 2019 20:35:38 +0200 Subject: [PATCH] ci: Update Dockerfile to :v2 This commit is a bit deceitful: The main change in the image is *not* the more recent Fedora base, but an updated (and not backward-compatible) evolution-data-server package from the fmuellner/gnome-shell-ci copr. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/501 ports gnome-shell to the new API, so to keep mutter and gnome-shell CI working after that change, we need to build against the correct EDS version. https://gitlab.gnome.org/GNOME/mutter/merge_requests/582 --- .gitlab-ci.yml | 2 +- .gitlab-ci/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63d8cee71..a7bd6f61c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.gnome.org/gnome/mutter/master:v1 +image: registry.gitlab.gnome.org/gnome/mutter/master:v2 stages: - review diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 49ecb563b..5d0e2ed83 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:29 +FROM fedora:30 RUN dnf -y update && dnf -y upgrade && \ dnf install -y 'dnf-command(builddep)' && \