From 78c94d81ed506bc59e747f5eb98cb8312f2ac2f0 Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@gnome.org>
Date: Tue, 28 Nov 2023 18:00:35 +0000
Subject: [PATCH] ci: Build with introspection enabled

In most CI builds. (Not all of them, though, so we can also test the
build works with it disabled.)

This is needed for the upcoming libgirepository tests, as they need some
GIR files to test against.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Helps: #3155
---
 .gitlab-ci.yml                      | 11 ++++++++---
 .gitlab-ci/debian-stable.Dockerfile |  2 ++
 .gitlab-ci/fedora.Dockerfile        |  2 ++
 .gitlab-ci/mingw.Dockerfile         |  2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad5ee8254..6101ffb48 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,11 +11,11 @@ cache:
     - _ccache/
 
 variables:
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v24"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v25"
   COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
-  DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v18"
+  DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v19"
   ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v3"
-  MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v14"
+  MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v15"
   MESON_TEST_TIMEOUT_MULTIPLIER: 4
   G_MESSAGES_DEBUG: all
   MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings"
@@ -120,6 +120,7 @@ fedora-x86_64:
             -Ddtrace=true
             -Dinstalled_tests=true
             -Ddocumentation=true
+            -Dintrospection=enabled
             _build
     - meson compile -C _build
     - mkdir -p _coverage
@@ -294,6 +295,7 @@ G_DISABLE_ASSERT:
             -Ddtrace=true
             -Dinstalled_tests=true
             -Dglib_assert=false
+            -Dintrospection=enabled
             _build
     - meson compile -C _build
     - bash -x ./.gitlab-ci/run-tests.sh
@@ -325,6 +327,7 @@ valgrind:
             -Dsystemtap=true
             -Ddtrace=true
             -Dinstalled_tests=true
+            -Dintrospection=enabled
             _build
     - meson compile -C _build
     # Valgrind doesn’t work when the soft FD limit is set too high
@@ -672,6 +675,7 @@ scan-build:
             -Dsystemtap=true
             -Ddtrace=true
             -Dinstalled_tests=true
+            -Dintrospection=enabled
             _scan_build
     - ninja -C _scan_build scan-build
   artifacts:
@@ -701,6 +705,7 @@ scan-build:
             -Dsystemtap=true
             -Ddtrace=true
             -Dinstalled_tests=true
+            -Dintrospection=enabled
             _coverity_build
     - $HOME/cov-analysis-linux64-*/bin/cov-build --dir cov-int meson compile -C _coverity_build
     - tar cfz cov-int.tar.gz cov-int
diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile
index a3b695073..4bcee4e2c 100644
--- a/.gitlab-ci/debian-stable.Dockerfile
+++ b/.gitlab-ci/debian-stable.Dockerfile
@@ -19,6 +19,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
     gi-docgen \
     git \
     libc6-dev \
+    gobject-introspection \
     gtk-doc-tools \
     itstool \
     lcov \
@@ -26,6 +27,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
     libdbus-1-dev \
     libelf-dev \
     libffi-dev \
+    libgirepository1.0-dev \
     libmount-dev \
     libpcre2-dev \
     libselinux1-dev \
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 9ca80f2d5..e73964064 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -35,6 +35,8 @@ RUN dnf -y update \
     glibc-langpack-th \
     glibc-langpack-tr \
     "gnome-desktop-testing >= 2018.1" \
+    gobject-introspection \
+    gobject-introspection-devel \
     gtk-doc \
     itstool \
     lcov \
diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile
index 712b23abe..d688a35a1 100644
--- a/.gitlab-ci/mingw.Dockerfile
+++ b/.gitlab-ci/mingw.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/glib/fedora:v24
+FROM registry.gitlab.gnome.org/gnome/glib/fedora:v25
 
 USER root