From 67fb5a94b6fe29ea44bb6e98719c982ad2901901 Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@gnome.org>
Date: Wed, 11 Dec 2024 15:36:00 +0000
Subject: [PATCH] ci: Enable -Dintrospection for dist builds

This means that the documentation can actually be generated, which was
broken before. Building the documentation requires `enable_gir`.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
---
 .gitlab-ci.yml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aac2d53a3..bc63d51d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -965,17 +965,25 @@ pages:
       - public
 
 dist-job:
+  extends:
+    - .build-gobject-introspection
+    - .build-linux
+    - .with-git
   image: "${FEDORA_IMAGE}"
   stage: build
+  before_script:
+    - !reference [".build-linux", "before_script"]
+    - !reference [".with-git", "before_script"]
+    - !reference [".build-gobject-introspection", "before_script"]
   only:
     - tags
   script:
-    # Ignore extra git security checks as we don't care in CI.
-    - git config --global --add safe.directory "${PWD}"
-    - git submodule update --init
-    - for m in $(git submodule foreach -q 'echo $path'); do git config --global --add safe.directory "${PWD}/${m}"; done
-    - meson subprojects download
-    - meson setup ${MESON_COMMON_OPTIONS} --buildtype release -Ddocumentation=true -Dman-pages=enabled _build
+    - meson setup ${MESON_COMMON_OPTIONS}
+            --buildtype release
+            -Ddocumentation=true
+            -Dintrospection=enabled
+            -Dman-pages=enabled
+            _build
     - meson dist -C _build
     # Compile again to build the docs
     - meson compile -C _build