diff options
author | Ebrahim Byagowi <ebrahim@gnu.org> | 2018-03-19 12:19:42 +0330 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-19 12:19:42 +0330 |
commit | 957e7756634a4fdf1654041e20e883cf964ecac9 (patch) | |
tree | 8b364c9df17473bfce99b22b4876cfc8c459dd4e /appveyor.yml | |
parent | 8d1b4082ae01b8fd87b2e83c89f670c1c7cfa0b1 (diff) |
[dwrite] Use new again and enable the build on msys2 bots (#890)
Diffstat (limited to 'appveyor.yml')
-rw-r--r-- | appveyor.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml index 5971337c..b6857206 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,11 +20,11 @@ environment: - compiler: msys2 - MINGW_PREFIX: /c/msys2/mingw64/ + MINGW_PREFIX: /mingw64 MINGW_CHOST: x86_64-w64-mingw32 MSYS2_ARCH: x86_64 - compiler: msys2 - MINGW_PREFIX: /c/msys2/mingw32/ + MINGW_PREFIX: /mingw32 MINGW_CHOST: i686-w64-mingw32 MSYS2_ARCH: i686 @@ -44,7 +44,8 @@ build_script: - '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 "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 --build=%MINGW_CHOST% --host=%MINGW_CHOST% --prefix=%MINGW_PREFIX%; make; make check || .ci/fail.sh"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "curl https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/include/dwrite_1.h?format=raw > %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"' cache: - c:\tools\vcpkg\installed\ |