X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=.travis.yml;fp=.travis.yml;h=bc6ab36d6e94ddb587d33e2094efa718af6bb1f9;hb=a49c04220da70ad6b6c5aef344b12bd3d3cd10a1;hp=a6bbeab3086534d1646150c9583ce2e4d2088d84;hpb=1536d1a0db5caef133c860d8c0d2d8097547f369;p=lsp-test.git

diff --git a/.travis.yml b/.travis.yml
index a6bbeab..bc6ab36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,6 @@ cache:
 addons:
   apt:
     packages:
-      - haskell-stack
       - npm
   homebrew:
     packages:
@@ -31,8 +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
-  - stack upgrade --binary-only # apt dist lags behind
+  - 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
@@ -42,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