Merge branch 'master' into travis-windows

diff --git a/.travis.yml b/.travis.yml
index faae98652da6078d133cecc3bf13a6f1990c4b4a..bc6ab36d6e94ddb587d33e2094efa718af6bb1f9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,22 +2,36 @@ language: c
 
 sudo: false
 
+os:
+- windows
+- linux
+- osx
+
+dist: xenial
+
 cache:
   directories:
     - .stack-work
     - $HOME/.stack
     - $HOME/haskell-ide-engine/.stack-work
+    - C:/Users/travis/AppData/Local/Programs/stack
+    - C:/sr
   timeout: 1000
 
 addons:
   apt:
     packages:
       - npm
+  homebrew:
+    packages:
+      - haskell-stack
+      - npm
 
 before_install:
   - mkdir -p ~/.local/bin
   - export PATH=$HOME/.local/bin:$PATH
-  - travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
+  - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install haskell-stack nodejs 7zip; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -sSL https://get.haskellstack.org/ | sh; fi
   - mkdir -p haskell-ide-engine
   - cd $HOME/haskell-ide-engine
   - git init