CI: Install a newer MSYS2 pango package; Don't allow failures again

gtk master requires a newer pango than msys2 has, so install our own copy on top.

See #2243

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d92ee001d1210ebde685d46d34aea07b3bff60f..84d250a1b19d0b894c894a95341bb9c417a10d44 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,6 @@ fedora-x86_64-staticlibs:
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
-  allow_failure: true
   cache:
     key: "%CI_JOB_NAME%"
     <<: *cache-paths

diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index 05624265f4e1e8f85f2e0b23f67d89e2fd9c487e..4b9f175c3f399a12408f3a0a68e8581069415f4f 100644 (file)
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -33,6 +33,10 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
     mingw-w64-$MSYS2_ARCH-shared-mime-info
 
+# https://gitlab.gnome.org/GNOME/gtk/issues/2243
+wget "https://gitlab.gnome.org/creiter/gitlab-ci-win32-runner/raw/master/pango/mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
+pacman --noconfirm -U "mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
+
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"