From 2c7e47623450047cd3afdf6c932fa8a3e1f8f413 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 24 Jul 2024 18:40:51 +0200 Subject: [PATCH] ci: Also build gobject-introspection in test-msys2.sh The build instructions for msys2 builds are stored outwith `.gitlab-ci.yml`. We need to build a specific (recent) version of gobject-introspection so we can get support for async annotations in `g-ir-scanner`. See !3746. Fixes commit ff38925f531b46786171e8c6a79b245abf991f63. Signed-off-by: Philip Withnall --- .gitlab-ci/test-msys2.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index e2700f7a6..6c308f14f 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -33,6 +33,11 @@ PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH" DIR="$(pwd)" export PATH CFLAGS +mkdir -p gobject-introspection +git clone --branch "${GOBJECT_INTROSPECTION_TAG}" https://gitlab.gnome.org/GNOME/gobject-introspection.git gobject-introspection +meson gobject-introspection gobject-introspection/build --prefix "/c/msys64/${MSYSTEM}/usr" +sudo meson install -C gobject-introspection/build + # FIXME: We can’t use ${MESON_COMMON_OPTIONS} here because this script installs # Meson 1.3. See the comment in .gitlab-ci.yml about the same problem on # FreeBSD.