From 5631d70d36aa7952d343ea794bd5169a730706ae Mon Sep 17 00:00:00 2001 From: Cosimo Lupo Date: Mon, 16 Jul 2018 12:41:59 +0200 Subject: [PATCH 1/3] appveyor.yml: try updating msys2 to fix failing mingw-w64-x86_64 build https://github.com/harfbuzz/harfbuzz/pull/1093#issuecomment-405201903 https://ci.appveyor.com/project/harfbuzz/harfbuzz/build/job/ky7lao1ii1bi7ew4#L71 --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 05a72d96d..91316e665 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,6 +29,8 @@ environment: MSYS2_ARCH: i686 install: + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman -Syu --noconfirm"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman -Su --noconfirm"' - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-x86_64-ragel" build_script: From 3ab52c6cb5c405366af804d278216e2d02a39ecb Mon Sep 17 00:00:00 2001 From: Cosimo Lupo Date: Mon, 16 Jul 2018 12:57:27 +0200 Subject: [PATCH 2/3] appveyor.yml: pass --needed option to pacman so it won't attempt reinstalling packages which are already installed --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 91316e665..9b00d84dc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,7 +45,7 @@ build_script: - 'if "%compiler%"=="msvc" msbuild harfbuzz.sln /p:Configuration=%configuration% /p:Platform=%platform%' - 'if "%compiler%"=="msvc" if not "%platform%"=="ARM" ctest --output-on-failure -C %configuration%' - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-$MSYS2_ARCH-{freetype,cairo,icu,gettext,gobject-introspection,gcc,gcc-libs,glib2,graphite2,pkg-config,python2}"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S --needed mingw-w64-$MSYS2_ARCH-{freetype,cairo,icu,gettext,gobject-introspection,gcc,gcc-libs,glib2,graphite2,pkg-config,python2}"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "curl https://raw.githubusercontent.com/mirror/mingw-w64/023eb04c396d4e8d8fcf604cfababc53dae13398/mingw-w64-headers/include/dwrite_1.h > %MINGW_PREFIX%/%MINGW_CHOST%/include/dwrite_1.h"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; ./autogen.sh --with-uniscribe --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2 --with-directwrite --build=%MINGW_CHOST% --host=%MINGW_CHOST% --prefix=%MINGW_PREFIX%; make; make check || .ci/fail.sh"' From 269eb45650be66901627da7f1014339065a948a5 Mon Sep 17 00:00:00 2001 From: Cosimo Lupo Date: Mon, 16 Jul 2018 14:14:42 +0200 Subject: [PATCH 3/3] appveyor.yml: try only updating msys2 core, not the rest of the packages maybe it'll get a bit faster --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 9b00d84dc..6250a91ed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,6 @@ environment: install: - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman -Syu --noconfirm"' - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman -Su --noconfirm"' - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-x86_64-ragel" build_script: