ci: Update the image

v32 of the image includes wayland-protocols 1.21, and
other updates from Fedora 34.

While we are at it, drop gtk-doc from the image, and drop
the separate DOCS_IMAGE - no longer used.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c279497ecbc0aa384891f0edad16f9bbb96344d6..026e5fe95ca98de844fc68c7327eebac5d3677cc 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,9 +24,8 @@ 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:v31"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v32"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
-  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v31"
 
 .only-default:
   only:
@@ -308,7 +307,7 @@ asan-build:
   allow_failure: true
 
 reference:
-  image: $DOCS_IMAGE
+  image: $FEDORA_IMAGE
   stage: docs
   needs: []
   variables:

diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 4f2aece46760aecdfdbf0e22283a7254e835c441..40c9850f525ce23f982ffd63b33fdd4620c1cfff 100644 (file)
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -38,7 +38,6 @@ RUN dnf -y install \
     gstreamer1-plugins-good \
     gstreamer1-plugins-bad-free-devel \
     gstreamer1-plugins-base-devel \
-    gtk-doc \
     hicolor-icon-theme \
     iso-codes \
     itstool \