From 51a8eb1c028ba430986bbe4b1e6afaf0063a6f76 Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Sun, 12 Jul 2020 23:40:50 +0430
Subject: [PATCH] [ci] use meson package from msys2

as https://github.com/harfbuzz/harfbuzz/issues/2561#issuecomment-657261692
---
 appveyor.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index ba5c74f7a..38692192a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,21 +31,18 @@ environment:
       MSYS2_ARCH: i686
       MSYSTEM: MINGW32
 
-
-install:
-  - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{gcc,freetype,cairo,icu,gettext,gobject-introspection,gcc,gcc-libs,glib2,graphite2,pkg-config,python3,python3-pip,ragel,ninja}"'
-  - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pip install fonttools meson"'
-
 build_script:
-  - set "PYTHON_ROOT=C:\python37-x64"
-  - set "PATH=%PYTHON_ROOT%;%PYTHON_ROOT%\Scripts;%PATH%"
-  - pip install --upgrade meson
-  - pip install fonttools
-  - 'if "%compiler%"=="msvc" "%vcvarsallpath%" %arch% && meson setup build --wrap-mode=default --buildtype=release -Dglib=enabled -Dfreetype=enabled -Dgdi=enabled -Ddirectwrite=enabled && meson test --print-errorlogs --suite=harfbuzz -Cbuild'
-
+  - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{gcc,freetype,cairo,icu,gettext,gobject-introspection,gcc,gcc-libs,glib2,graphite2,pkg-config,python3,python3-pip,ragel,meson,ninja}"'
+  - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pip install fonttools"'
   - '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; meson build --wrap-mode=nofallback -Dfreetype=enabled -Dglib=enabled -Dcairo=enabled -Dgobject=enabled -Dgdi=enabled -Ddirectwrite=enabled -Dgraphite=enabled && meson test -Cbuild --print-errorlogs"'
 
+  - set "PYTHON_ROOT=C:\python37-x64"
+  - set "PATH=%PYTHON_ROOT%;%PYTHON_ROOT%\Scripts;%PATH%"
+  - 'if "%compiler%"=="msvc" pip install --upgrade meson'
+  - 'if "%compiler%"=="msvc" pip install fonttools'
+  - 'if "%compiler%"=="msvc" "%vcvarsallpath%" %arch% && meson setup build --wrap-mode=default --buildtype=release -Dglib=enabled -Dfreetype=enabled -Dgdi=enabled -Ddirectwrite=enabled && meson test --print-errorlogs --suite=harfbuzz -Cbuild'
+
 cache:
   - c:\tools\vcpkg\installed\