From 02d35309e60521b24a007c3e6c5e68e503423aa5 Mon Sep 17 00:00:00 2001
From: Robert Mader <robert.mader@posteo.de>
Date: Sat, 17 Dec 2022 18:12:43 +0100
Subject: [PATCH] ci: Bump base image to F37

And clean up custom installs.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2769>
---
 .gitlab-ci.yml | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 210b9b4c3..febb7fdb8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,15 +17,14 @@ variables:
 
 .mutter.fedora@common:
   variables:
-    FDO_DISTRIBUTION_VERSION: 36
-    BASE_TAG: '2022-11-25.0'
+    FDO_DISTRIBUTION_VERSION: 37
+    BASE_TAG: '2022-12-17.0'
     FDO_DISTRIBUTION_PACKAGES:
       asciidoc
       clang
       gcovr
       gdm
       gnome-shell
-      mozjs91-devel
       sassc
       uncrustify
       xorg-x11-server-Xvfb
@@ -48,28 +47,6 @@ variables:
       dnf builddep -y wayland-protocols --setopt=install_weak_deps=False &&
       dnf builddep -y kernel --setopt=install_weak_deps=False &&
 
-      ./.gitlab-ci/install-meson-project.sh \
-        https://gitlab.gnome.org/GNOME/gjs.git \
-        1.73.1 . &&
-
-      ./.gitlab-ci/install-meson-project.sh \
-        -Dvapi=false \
-        -Dgtk3=false \
-        -Dgtk4=false \
-        -Dgtk_doc=false \
-        -Dssh_agent=false \
-        -Dsystemd=disabled \
-        https://gitlab.gnome.org/GNOME/gcr.git \
-        3.90.0 . &&
-
-      ./.gitlab-ci/install-meson-project.sh \
-        https://gitlab.freedesktop.org/wayland/wayland.git \
-        1.21.0 . &&
-
-      ./.gitlab-ci/install-meson-project.sh \
-        https://gitlab.freedesktop.org/wayland/wayland-protocols.git \
-        1.26 . &&
-
       ./.gitlab-ci/install-meson-project.sh \
         https://gitlab.gnome.org/jadahl/catch.git \
         main . 29ad36e2b1d28ac9d8b2bc44af46296cb1db5d66 &&