ci: Update the Fedora image to F33

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c6d15c8a742723fdc587eddd8e0b2203b08e5c1..8476616092676e44b7be7cbb920b0f2d987d0018 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ 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:v27"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v28"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
   DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v25"
 

diff --git a/.gitlab-ci/fedora-base.Dockerfile b/.gitlab-ci/fedora-base.Dockerfile
index 613d492d344ce1ab5ff6cadff3b34cdaa563d943..04377f05e5cccf9dda983d9509279e103670fbea 100644 (file)
--- a/.gitlab-ci/fedora-base.Dockerfile
+++ b/.gitlab-ci/fedora-base.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:33
 
 RUN dnf -y install \
     adwaita-icon-theme \
@@ -66,7 +66,7 @@ RUN dnf -y install \
     mesa-dri-drivers \
     mesa-libEGL-devel \
     mesa-libGLES-devel \
-    mesa-libwayland-egl-devel \
+    meson \
     ninja-build \
     pango-devel \
     pcre-devel \
@@ -87,6 +87,3 @@ RUN dnf -y install \
     which \
     xorg-x11-server-Xvfb \
  && dnf clean all
-
-RUN pip3 install meson==0.55.3
-

diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index ddcc18f2878206dc929b3023f66d7eee0205b65d..c64f0947b7cb365b7a512548981fed6898a685d9 100644 (file)
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v27
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v28
 
 # Enable sudo for wheel users
 RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers