From 56f744f5f50caa457a1bf55f26ea0c008fde1533 Mon Sep 17 00:00:00 2001
From: Nepomuk Seiler <nepomuk.seiler@mukis.de>
Date: Sun, 15 Jan 2017 14:39:07 +0100
Subject: [PATCH] Fix appveyor build

- use chocolatey
- add extra ci command
---
 appveyor.yml | 15 +++------------
 build.sbt    |  3 +++
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6b4d8503f..c55a3b24f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,22 +1,13 @@
 version: '{build}'
 os: Windows Server 2012
 install:
-  - ps: |
-      Add-Type -AssemblyName System.IO.Compression.FileSystem
-      if (!(Test-Path -Path "C:\sbt" )) {
-        (new-object System.Net.WebClient).DownloadFile(
-          'https://dl.bintray.com/sbt/native-packages/sbt/0.13.7/sbt-0.13.7.zip',
-          'C:\sbt-bin.zip'
-        )
-        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sbt-bin.zip", "C:\sbt")
-      }
-  - cmd: SET PATH=C:\sbt\sbt\bin;%JAVA_HOME%\bin;%PATH%
+  - cmd: choco install sbt -ia "INSTALLDIR=""C:\sbt"""
+  - cmd: SET PATH=C:\sbt\bin;%JAVA_HOME%\bin;%PATH%
   - cmd: SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g
 build_script:
   - sbt clean compile
 test_script:
-  - sbt "test-only * -- -n windows"
-  - sbt "scripted universal/dist universal/stage windows/*"
+  - sbt validateWindows
 cache:
   - C:\sbt\
   - C:\Users\appveyor\.m2
diff --git a/build.sbt b/build.sbt
index 47c6395ca..a94453a7b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -54,3 +54,6 @@ bintrayRepository := "sbt-plugin-releases"
 
 // scalafmt
 scalafmtConfig := Some(file(".scalafmt.conf"))
+
+// ci commands
+addCommandAlias("validateWindows", ";test-only * -- -n windows;scripted universal/dist universal/stage windows/*")