Merge branch 'wip/pwithnall/dist-faff' into 'main'

ci: Enable -Dintrospection for dist builds

See merge request GNOME/glib!4433

.gitlab-ci.yml

@@ -965,25 +965,35 @@ pages:
       - public
 
 dist-job:
+  extends:
+    - .build-gobject-introspection
+    - .build-linux
+    - .with-git
   image: "${FEDORA_IMAGE}"
   stage: build
+  needs: []
+  before_script:
+    - !reference [".build-linux", "before_script"]
+    - !reference [".with-git", "before_script"]
+    - !reference [".build-gobject-introspection", "before_script"]
   only:
+    - schedules
     - 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
-    - tar -c -J -f "glib-docs-${CI_COMMIT_TAG}.tar.xz" -C _build/docs/reference/glib glib-2.0
-    - tar -c -J -f "gmodule-docs-${CI_COMMIT_TAG}.tar.xz" -C _build/docs/reference/gmodule gmodule-2.0
-    - tar -c -J -f "gobject-docs-${CI_COMMIT_TAG}.tar.xz" -C _build/docs/reference/gobject gobject-2.0
-    - tar -c -J -f "gio-docs-${CI_COMMIT_TAG}.tar.xz" -C _build/docs/reference/gio gio-2.0
-    - tar -c -J -f "girepository-docs-${CI_COMMIT_TAG}.tar.xz" -C _build/docs/reference/girepository girepository-2.0
+    - tar -c -J -f "_build/glib-docs-${CI_COMMIT_TAG}.tar.xz" -C _build/docs/reference/glib glib-2.0
+    - tar -c -J -f "_build/gmodule-docs-${CI_COMMIT_TAG}.tar.xz" -C _build/docs/reference/gmodule gmodule-2.0
+    - tar -c -J -f "_build/gobject-docs-${CI_COMMIT_TAG}.tar.xz" -C _build/docs/reference/gobject gobject-2.0
+    - tar -c -J -f "_build/gio-docs-${CI_COMMIT_TAG}.tar.xz" -C _build/docs/reference/gio gio-2.0
+    - tar -c -J -f "_build/girepository-docs-${CI_COMMIT_TAG}.tar.xz" -C _build/docs/reference/girepository girepository-2.0
   artifacts:
     paths:
       - "${CI_PROJECT_DIR}/_build/glib-docs-${CI_COMMIT_TAG}.tar.xz"

docs/reference/meson.build

@@ -15,6 +15,8 @@ if get_option('documentation') and enable_gir
     '--fatal-warnings',
     '--add-include-path=@0@'.format(meson.current_build_dir() / '../../girepository/introspection'),
   ]
+elif get_option('documentation')
+  warning('Full documentation cannot be built without -Dintrospection=enabled')
 endif
 
 docs_dir = glib_datadir / 'doc'