Merge branch 'msys2-ci' into 'main'

CI/MSYS2: Fix prefix for gobject-introspection

See merge request GNOME/glib!4338
This commit is contained in:
Philip Withnall 2024-10-08 12:15:56 +00:00
commit da5ce72171

View File

@ -2,8 +2,6 @@
set -ex set -ex
export PATH="/c/msys64/$MSYSTEM/bin:$PATH"
pacman --noconfirm -Suy pacman --noconfirm -Suy
pacman --noconfirm -S --needed \ pacman --noconfirm -S --needed \
@ -40,7 +38,7 @@ export PATH CFLAGS
if [[ $(vercmp "$(pacman -Qi "${MINGW_PACKAGE_PREFIX}"-gobject-introspection | grep -Po '^Version\s*: \K.+')" "${GOBJECT_INTROSPECTION_TAG}") -lt 0 ]]; then if [[ $(vercmp "$(pacman -Qi "${MINGW_PACKAGE_PREFIX}"-gobject-introspection | grep -Po '^Version\s*: \K.+')" "${GOBJECT_INTROSPECTION_TAG}") -lt 0 ]]; then
mkdir -p gobject-introspection mkdir -p gobject-introspection
git clone --branch "${GOBJECT_INTROSPECTION_TAG}" https://gitlab.gnome.org/GNOME/gobject-introspection.git 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" meson setup gobject-introspection gobject-introspection/build --prefix "${MINGW_PREFIX}"
meson install -C gobject-introspection/build meson install -C gobject-introspection/build
fi fi