From 5e5065c2b51ee27eb0e362693e925358c56cdd14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 19 Jun 2023 18:39:54 +0200
Subject: [PATCH] ci: Use libadwaita from git

The extensions app now depends on a development version of
libadwaita, so include it in the image.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3081>
---
 .gitlab-ci.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0a48b3a2..0d4336481 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,7 +69,7 @@ variables:
     - .skip-git-clone
   variables:
     FDO_DISTRIBUTION_VERSION: 38
-    BASE_TAG: '2023-05-29.2'
+    BASE_TAG: '2023-06-19.1'
     FDO_USER: 'meta-user'
     FDO_DISTRIBUTION_PACKAGES:
       asciidoc
@@ -88,6 +88,7 @@ variables:
       python3-dbusmock
       pkgconfig(libgcrypt)
       pkgconfig(libnma-gtk4)
+      pkgconfig(appstream)
 
     FDO_DISTRIBUTION_EXEC: |
       set -e
@@ -102,6 +103,7 @@ variables:
       dnf builddep -y wayland-protocols --setopt=install_weak_deps=False
       dnf builddep -y kernel --setopt=install_weak_deps=False
       dnf builddep -y zenity --setopt=install_weak_deps=False
+      dnf builddep -y gtk4 --setopt=install_weak_deps=False
 
       ./.gitlab-ci/install-meson-project.sh \
         https://gitlab.gnome.org/jadahl/catch.git \
@@ -112,6 +114,14 @@ variables:
         https://gitlab.gnome.org/GNOME/zenity.git \
         master . db1ad8ee7c3db36a7cca6e998e86719293d37838
 
+      ./.gitlab-ci/install-meson-project.sh \
+        https://gitlab.gnome.org/GNOME/gtk.git \
+        main . 55dd5f47808730ae4f1ffaa481ae37dd536b410a
+
+      ./.gitlab-ci/install-meson-project.sh \
+        https://gitlab.gnome.org/GNOME/libadwaita.git \
+        main . 72f512f01113a64cf332ae0f79becfc487d54b56
+
       rpm -e --nodeps gnome-bluetooth-libs-devel \
                       mutter mutter-devel \
                       gnome-shell