Expand matrix for #3186

diff --git a/appveyor.yml b/appveyor.yml
index a6009fa5f1e7910bdd0e7fd634aacbfcf75a8ae1..7c9839c2f9cb519e83d6b0f72ff1948b90f94a08 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,19 +1,25 @@
 environment:
   CFG_DISABLE_CROSS_TESTS: 1
   matrix:
-  - MSVC: 1
+  - TARGET: i686-pc-windows-msvc
+    MSVC: 1
     BITS: 32
-    TARGET: i686-pc-windows-msvc
     ARCH: x86
-  - MSVC: 1
+  - TARGET: x86_64-pc-windows-msvc
+    MSVC: 1
     BITS: 64
-    TARGET: x86_64-pc-windows-msvc
     ARCH: amd64
+  - TARGET: x86_64-pc-windows-gnu
+    ARCH: amd64
+    BITS: 32
+  - TARGET: i686-pc-windows-gnu
+    ARCH: x86
+    BITS: 64
 
 install:
+  - IF "%MSVC%"=="" set PATH=C:\msys64\mingw%BITS%\bin;C:\msys64\usr\bin;%PATH%
   - python src/etc/install-deps.py
   - python src/etc/dl-snapshot.py %TARGET%
-  - call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %ARCH%
   - SET PATH=%PATH%;%cd%/rustc/bin
   - SET PATH=%PATH%;%cd%/target/snapshot/bin
   - rustc -V
@@ -23,7 +29,3 @@ build: false
 
 test_script:
   - cargo test
-
-branches:
-  only:
-    - master