Add Cygwin/x86_64 to AppVeyor CI matrix

Install ninja and packages needed for tests
Don't bother with x86 for speed and reliability reasons

3 files changed, 30 insertions, 2 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index 9264f49..c79e250 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -38,6 +38,10 @@ environment:
       compiler: msys2-mingw
       backend: ninja
 
+    - arch: x64
+      compiler: cygwin
+      backend: ninja
+
 platform:
   - x64
 
@@ -55,15 +59,22 @@ install:
   - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% )
   - cmd: if %compiler%==msvc2017 ( call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=%arch% )
   - cmd: if %compiler%==msys2-mingw (if %arch%==x86 (set "PATH=C:\msys64\mingw32\bin;%PATH%") else (set "PATH=C:\msys64\mingw64\bin;%PATH%"))
+  - cmd: if %compiler%==cygwin ( call ci\appveyor-install.bat )
 
 build_script:
   - cmd: echo No build step.
-  - cmd: if %backend%==ninja ( ninja.exe --version ) else ( MSBuild /version & echo. )
+  - cmd: if not %compiler%==cygwin if %backend%==ninja ( ninja.exe --version ) else ( MSBuild /version & echo. )
 
 test_script:
   - cmd: echo Running tests for %arch% and %compiler% with the %backend% backend
-  - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && python run_tests.py --backend=%backend%
+  - cmd: set "ORIG_PATH=%PATH%"
+  - cmd: if %compiler%==cygwin ( set "PATH=%CYGWIN_ROOT%\bin;%SYSTEMROOT%\system32" && bash -lc "cd $APPVEYOR_BUILD_FOLDER && ci/appveyor-test.sh" )
+  - cmd: if not %compiler%==cygwin ( set "PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%;" && python run_tests.py --backend=%backend% )
 
 on_finish:
+  - set "PATH=%ORIG_PATH%"
   - appveyor PushArtifact meson-test-run.txt -DeploymentName "Text test logs"
   - appveyor PushArtifact meson-test-run.xml -DeploymentName "XML test logs"
+
+cache:
+  - C:\cache
diff --git a/ci/appveyor-install.bat b/ci/appveyor-install.bat
new file mode 100644
index 0000000..0c1ce44
--- /dev/null
+++ b/ci/appveyor-install.bat
@@ -0,0 +1,11 @@
+set CACHE=C:\cache
+set CYGWIN_MIRROR="http://cygwin.mirror.constant.com"
+
+if _%arch%_ == _x64_ set SETUP=setup-x86_64.exe && set CYGWIN_ROOT=C:\cygwin64
+if _%arch%_ == _x86_ set SETUP=setup-x86.exe && set CYGWIN_ROOT=C:\cygwin
+
+if not exist %CACHE% mkdir %CACHE%
+
+echo Updating Cygwin and installing ninja and test prerequisites
+%CYGWIN_ROOT%\%SETUP% -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -l "%CACHE%" -g -P "ninja,gcc-objc,gcc-objc++,libglib2.0-devel,zlib-devel"
+echo Install done
diff --git a/ci/appveyor-test.sh b/ci/appveyor-test.sh
new file mode 100755
index 0000000..2f29630
--- /dev/null
+++ b/ci/appveyor-test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo ninja $(ninja --version)
+python3 --version -V
+
+python3 run_tests.py --backend=${backend}