From 7e7bdab6f4ee67e04fccf542ea72f3084d28e997 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 23 Sep 2021 17:13:17 +0200
Subject: Use glib subproject to generate the GIR files

Previously, we included C files with documentation comments extracted from GLib libraries
in the repository to make it self-contained. Unfortunately, that obscured the source file names,
leading to incorrect links in the generated documentation.

Since we switched to Meson, we can just use subprojects and the build system will handle it for us.
---
 .gitlab-ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f455f50..2c9ff68e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ example-meson:
   variables:
     EXTRA_MESON_FLAGS: "-Ddoctool=enabled -Dgtk_doc=true"
   script:
+    - meson subprojects download glib
     - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _build .
     - meson compile -C _build
     - sudo meson install -C _build
@@ -35,6 +36,7 @@ example-autotools:
   variables:
     EXTRA_MESON_FLAGS: "-Ddoctool=enabled -Dgtk_doc=true"
   script:
+    - meson subprojects download glib
     - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _build .
     - meson compile -C _build
     - sudo meson install -C _build
@@ -52,6 +54,7 @@ fedora-x86_64-meson:
     CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache"
     EXTRA_MESON_FLAGS: "-Ddoctool=enabled -Dgtk_doc=true -Dwerror=true"
   script:
+    - meson subprojects download glib
     - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _build .
     - meson compile -C _build
     - meson test -C _build --print-errorlogs --suite=gobject-introspection --no-suite=glib
@@ -96,6 +99,7 @@ fedora-x86_64-no-introspection-data:
     CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache"
     EXTRA_MESON_FLAGS: "-Dwerror=true"
   script:
+    - meson subprojects download glib
     - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _build .
     - meson compile -C _build
     - meson test -C _build --print-errorlogs --suite=gobject-introspection --no-suite=glib
@@ -115,6 +119,7 @@ fedora-x86_64-python3.6:
     CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache"
     PYENV_VERSION: "3.6.12"
   script:
+    - meson subprojects download glib
     - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _build .
     - meson compile -C _build
     - meson test -C _build --print-errorlogs --suite=gobject-introspection --no-suite=glib
-- 
cgit v1.2.1