From e6d5d9c910ef67069c03783308c8f480084ff0c9 Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <jviotti@openmailbox.org>
Date: Mon, 12 Dec 2016 14:33:16 -0400
Subject: [PATCH] chore: run tests in x64 and x86 in Appveyor (#963)

This will allow us to later publish development builds for both
architectures from Appveyor. In order to easily do so, the Makefile is
used instead of the current `./scripts/build/windows.bat`.

Signed-off-by: Juan Cruz Viotti <jviotti@openmailbox.org>
---
 Makefile     | 2 +-
 appveyor.yml | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index b9295d4a..29dba4f0 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ endif
 #
 #   make <target> TARGET_ARCH=<arch>
 #
-TARGET_ARCH = $(HOST_ARCH)
+TARGET_ARCH ?= $(HOST_ARCH)
 
 # ---------------------------------------------------------------------
 # Code signing
diff --git a/appveyor.yml b/appveyor.yml
index 59564540..b6d7abcb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,22 +17,25 @@ cache:
 environment:
   global:
     ELECTRON_NO_ATTACH_CONSOLE: true
+    nodejs_version: 6.1.0
   matrix:
-    - nodejs_version: 6.1.0
+    - TARGET_ARCH: x64
+    - TARGET_ARCH: x86
 
 install:
   - ps: Install-Product node $env:nodejs_version x64
   - npm install -g npm bower rimraf asar
   - choco install nsis -version 2.51
   - choco install upx
-  - choco install 7zip.commandline
+  - choco install jq
   - set PATH=C:\Program Files (x86)\Windows Kits\8.1\bin\x86;%PATH%
   - set PATH=C:\Program Files (x86)\NSIS;%PATH%
   - set PATH=C:\Ruby22\bin;%PATH%
   - set PATH=C:\MinGW\bin;%PATH%
   - set PATH=C:\MinGW\msys\1.0\bin;%PATH%
   - gem install scss_lint
-  - .\scripts\build\windows.bat install x64
+  - make info
+  - make electron-develop
 
 build: off