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
This commit is contained in:
Philip Withnall 2023-11-28 18:00:35 +00:00
parent 76a70381d4
commit 78c94d81ed
4 changed files with 13 additions and 4 deletions

View File

@ -11,11 +11,11 @@ cache:
- _ccache/ - _ccache/
variables: 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" 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" 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 MESON_TEST_TIMEOUT_MULTIPLIER: 4
G_MESSAGES_DEBUG: all G_MESSAGES_DEBUG: all
MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings" MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings"
@ -120,6 +120,7 @@ fedora-x86_64:
-Ddtrace=true -Ddtrace=true
-Dinstalled_tests=true -Dinstalled_tests=true
-Ddocumentation=true -Ddocumentation=true
-Dintrospection=enabled
_build _build
- meson compile -C _build - meson compile -C _build
- mkdir -p _coverage - mkdir -p _coverage
@ -294,6 +295,7 @@ G_DISABLE_ASSERT:
-Ddtrace=true -Ddtrace=true
-Dinstalled_tests=true -Dinstalled_tests=true
-Dglib_assert=false -Dglib_assert=false
-Dintrospection=enabled
_build _build
- meson compile -C _build - meson compile -C _build
- bash -x ./.gitlab-ci/run-tests.sh - bash -x ./.gitlab-ci/run-tests.sh
@ -325,6 +327,7 @@ valgrind:
-Dsystemtap=true -Dsystemtap=true
-Ddtrace=true -Ddtrace=true
-Dinstalled_tests=true -Dinstalled_tests=true
-Dintrospection=enabled
_build _build
- meson compile -C _build - meson compile -C _build
# Valgrind doesnt work when the soft FD limit is set too high # Valgrind doesnt work when the soft FD limit is set too high
@ -672,6 +675,7 @@ scan-build:
-Dsystemtap=true -Dsystemtap=true
-Ddtrace=true -Ddtrace=true
-Dinstalled_tests=true -Dinstalled_tests=true
-Dintrospection=enabled
_scan_build _scan_build
- ninja -C _scan_build scan-build - ninja -C _scan_build scan-build
artifacts: artifacts:
@ -701,6 +705,7 @@ scan-build:
-Dsystemtap=true -Dsystemtap=true
-Ddtrace=true -Ddtrace=true
-Dinstalled_tests=true -Dinstalled_tests=true
-Dintrospection=enabled
_coverity_build _coverity_build
- $HOME/cov-analysis-linux64-*/bin/cov-build --dir cov-int meson compile -C _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 - tar cfz cov-int.tar.gz cov-int

View File

@ -19,6 +19,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
gi-docgen \ gi-docgen \
git \ git \
libc6-dev \ libc6-dev \
gobject-introspection \
gtk-doc-tools \ gtk-doc-tools \
itstool \ itstool \
lcov \ lcov \
@ -26,6 +27,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
libdbus-1-dev \ libdbus-1-dev \
libelf-dev \ libelf-dev \
libffi-dev \ libffi-dev \
libgirepository1.0-dev \
libmount-dev \ libmount-dev \
libpcre2-dev \ libpcre2-dev \
libselinux1-dev \ libselinux1-dev \

View File

@ -35,6 +35,8 @@ RUN dnf -y update \
glibc-langpack-th \ glibc-langpack-th \
glibc-langpack-tr \ glibc-langpack-tr \
"gnome-desktop-testing >= 2018.1" \ "gnome-desktop-testing >= 2018.1" \
gobject-introspection \
gobject-introspection-devel \
gtk-doc \ gtk-doc \
itstool \ itstool \
lcov \ lcov \

View File

@ -1,4 +1,4 @@
FROM registry.gitlab.gnome.org/gnome/glib/fedora:v24 FROM registry.gitlab.gnome.org/gnome/glib/fedora:v25
USER root USER root