[gtk: 2/3] CI: Install a newer MSYS2 pango package; Don't allow failures again



commit 5ef2748ceff64e3eb7c10374471ec2c7fff8db35
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Tue Dec 17 20:23:28 2019 +0100

    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

 .gitlab-ci.yml           | 1 -
 .gitlab-ci/test-msys2.sh | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d92ee001d..84d250a1b1 100644
--- 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 05624265f4..4b9f175c3f 100644
--- 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"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]