[gtk/matthiasc/for-master] ci: Try to get everything building again



commit 9bac1297075b15dcd2a14afc930f3b4357d76f78
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Sep 30 23:37:09 2020 -0400

    ci: Try to get everything building again
    
    It turns out that the sysprof meson setup does not
    work with meson 0.54 :( So version 25 of our ci images
    bumps the meson version to 0.55.3.

 .gitlab-ci.yml                    | 4 ++--
 .gitlab-ci/fedora-base.Dockerfile | 2 +-
 .gitlab-ci/fedora-docs.Dockerfile | 2 +-
 .gitlab-ci/fedora.Dockerfile      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b183a5e521..0d22977a8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,9 +20,9 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v24"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v25"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
-  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v24"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v25"
 
 .only-default:
   only:
diff --git a/.gitlab-ci/fedora-base.Dockerfile b/.gitlab-ci/fedora-base.Dockerfile
index 70feffded2..7719fe5e56 100644
--- a/.gitlab-ci/fedora-base.Dockerfile
+++ b/.gitlab-ci/fedora-base.Dockerfile
@@ -87,5 +87,5 @@ RUN dnf -y install \
     xorg-x11-server-Xvfb \
  && dnf clean all
 
-RUN pip3 install meson==0.54.3
+RUN pip3 install meson==0.55.3
 
diff --git a/.gitlab-ci/fedora-docs.Dockerfile b/.gitlab-ci/fedora-docs.Dockerfile
index 6233d38708..d2e8c5ad40 100644
--- a/.gitlab-ci/fedora-docs.Dockerfile
+++ b/.gitlab-ci/fedora-docs.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v24
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v25
 
 RUN dnf -y install pandoc
 
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 0abba4bad5..a7a35b4299 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v24
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v25
 
 # Enable sudo for wheel users
 RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]