From 9a7a5007a08b055244ecd9288790a3d73828080c Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@gnome.org>
Date: Wed, 18 Dec 2024 14:45:57 +0000
Subject: [PATCH] ci: Bump CI image to use gsettings-desktop-schemas 48.alpha

This contains the new screen time limits schema
(https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/merge_requests/87)
which will shortly be needed by gnome-shell.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4189>
---
 .gitlab-ci.yml                            |  2 +-
 .gitlab-ci/install-common-dependencies.sh | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ead25af99..559745220 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,7 +105,7 @@ variables:
     - .skip-git-clone
   variables:
     FDO_DISTRIBUTION_VERSION: 41
-    BASE_TAG: '2024-10-15.0'
+    BASE_TAG: '2024-12-18.0'
     MUTTER_USER: 'meta-user'
     FDO_DISTRIBUTION_PACKAGES:
       clang
diff --git a/.gitlab-ci/install-common-dependencies.sh b/.gitlab-ci/install-common-dependencies.sh
index 4e1b569e0..ee2a90690 100755
--- a/.gitlab-ci/install-common-dependencies.sh
+++ b/.gitlab-ci/install-common-dependencies.sh
@@ -78,11 +78,10 @@ OPTIONS+=( "${DESTDIRS[@]/#/--destdir=}" )
 
 SCRIPTS_DIR="$(dirname $0)"
 
-## Add necessary dependencies here, for example
-# if ! pkgconf --atleast-version 1.23.0 wayland-server
-# then
-#     ./$SCRIPTS_DIR/install-meson-project.sh \
-#       "${OPTIONS[@]}" \
-#       https://gitlab.freedesktop.org/wayland/wayland.git \
-#       1.23.0
-# fi
+if ! pkgconf --atleast-version 48.alpha gsettings-desktop-schemas
+then
+    ./$SCRIPTS_DIR/install-meson-project.sh \
+      "${OPTIONS[@]}" \
+      https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \
+      master
+fi