From 31bd6956f0c2c946661b4025ac070afb10133016 Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Mon, 30 Sep 2024 15:06:20 +0200 Subject: [PATCH 1/2] CI/MSYS2: Fix prefix for gobject-introspection The right prefix is /c/msys64/${MSYSTEM}, without the final /usr. Anyway let's simply use the MINGW_PREFIX environment variable. --- .gitlab-ci/test-msys2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index 29c103a4f..da262535c 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -40,7 +40,7 @@ export PATH CFLAGS if [[ $(vercmp "$(pacman -Qi "${MINGW_PACKAGE_PREFIX}"-gobject-introspection | grep -Po '^Version\s*: \K.+')" "${GOBJECT_INTROSPECTION_TAG}") -lt 0 ]]; then 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" + meson setup gobject-introspection gobject-introspection/build --prefix "${MINGW_PREFIX}" meson install -C gobject-introspection/build fi From f66d144091120bf47d83167e8a77040065c6f97e Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Tue, 8 Oct 2024 13:35:52 +0200 Subject: [PATCH 2/2] test-msys2.sh: Remove unnecessary line ${MINGW_PREFIX}/bin is already in PATH --- .gitlab-ci/test-msys2.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index da262535c..112c6c305 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -2,8 +2,6 @@ set -ex -export PATH="/c/msys64/$MSYSTEM/bin:$PATH" - pacman --noconfirm -Suy pacman --noconfirm -S --needed \