Merge branch 'master' into travis-windows

[lsp-test.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index adbb59f2fca381c63a18de131154179b643d3a52..bc6ab36d6e94ddb587d33e2094efa718af6bb1f9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,6 @@ cache:
 addons:
   apt:
     packages:
-      - haskell-stack
       - npm
   homebrew:
     packages:
@@ -31,7 +30,8 @@ addons:
 before_install:
   - mkdir -p ~/.local/bin
   - export PATH=$HOME/.local/bin:$PATH
-  - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install haskell-stack nodejs; fi
+  - 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
@@ -41,7 +41,6 @@ before_install:
   - git submodule init
   - git submodule sync
   - git submodule update --init
-  - stack setup --silent # prevent windows logging vommit
   - stack --no-terminal --skip-ghc-check -j2 install
   - stack exec hoogle generate
   - cd $TRAVIS_BUILD_DIR