[gnome-shell/wip/carlosg/bump-wayland-protocols] ci: Include wayland-protocols 1.23 in the image

[Carlos Garnacho <carlosg src gnome org>]

commit 975d73bf4ba646b99b01a61d1a25aa1f4443b598
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sat Dec 4 16:23:09 2021 +0100

    ci: Include wayland-protocols 1.23 in the image
    
    This updated dependency is brought by Mutter, build wayland-protocols
    while we cannot get an up-to-date enough version from Fedora
    repositories.
    
    Also, tell the build/test/analyze stages to use the image we build
    for ourselves.

 .gitlab-ci.yml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ec1fbe2c2..e0c7d71954 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,7 +50,7 @@ workflow:
 .gnome-shell.fedora:34:
   variables:
     FDO_DISTRIBUTION_VERSION: 34
-    FDO_DISTRIBUTION_TAG: '2021-08-12.0'
+    FDO_DISTRIBUTION_TAG: '2021-12-04.0'
     FDO_DISTRIBUTION_PACKAGES: >
       findutils mozjs78-devel nodejs npm meson
       pkgconfig(gio-2.0) pkgconfig(gio-unix-2.0)
@@ -61,6 +61,7 @@ workflow:
 
       dnf group install -y 'Development Tools' \
                  'C Development Tools and Libraries' &&
+      dnf builddep -y wayland-protocols --setopt=install_weak_deps=False &&
 
       ./.gitlab-ci/install-meson-project.sh \
         -Dman=false \
@@ -69,6 +70,10 @@ workflow:
         subprojects/extensions-tool/ \
         ./generate-translations.sh &&
 
+      ./.gitlab-ci/install-meson-project.sh \
+        https://gitlab.freedesktop.org/wayland/wayland-protocols.git \
+        1.23 . "" &&
+
       dnf clean all
 
 check_commit_log:
@@ -185,8 +190,13 @@ no_template_check:
     - ./.gitlab-ci/check-template-strings.sh
 
 build:
+  extends:
+    - .fdo.distribution-image@fedora
+    - .gnome-shell.fedora:34
   stage: build
-  needs: ["check_commit_log"]
+  needs:
+    - check_commit_log
+    - build-fedora-container
   before_script:
     - .gitlab-ci/checkout-mutter.sh
     - meson mutter mutter/build --prefix=/usr
@@ -202,6 +212,9 @@ build:
       - build
 
 test:
+  extends:
+    - .fdo.distribution-image@fedora
+    - .gnome-shell.fedora:34
   stage: test
   needs: ["build"]
   variables:
@@ -220,6 +233,9 @@ test:
     when: on_failure
 
 test-coverity:
+  extends:
+    - .fdo.distribution-image@fedora
+    - .gnome-shell.fedora:34
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $GNOME_SHELL_SCHEDULED_JOB == "coverity"'
       when: always