X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=.travis.yml;h=f26edb0e6c7e24605a0d183f5c3ac78d36777de0;hb=refs%2Fheads%2Ftravis-windows;hp=adbb59f2fca381c63a18de131154179b643d3a52;hpb=d1b1f9a403a4c98b27c057742fc72325148bd622;p=lsp-test.git

diff --git a/.travis.yml b/.travis.yml
index adbb59f..f26edb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,6 @@ cache:
 addons:
   apt:
     packages:
-      - haskell-stack
       - npm
   homebrew:
     packages:
@@ -29,21 +28,19 @@ addons:
       - npm
 
 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; /C/ProgramData/chocolatey/bin/RefreshEnv.cmd; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.linux.sh; fi
   - mkdir -p haskell-ide-engine
   - cd $HOME/haskell-ide-engine
   - git init
   - git remote add origin https://github.com/haskell/haskell-ide-engine.git
   - git pull origin master
-  - git checkout f5c903f31ef5a7ee75984faf2e6ccc0a06ab23eb
+  - git checkout 1a5640f4790bde364dcd0a61617c5ca5b85b145a
   - 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
+  - stack --no-terminal --skip-ghc-check -j2 install --stack-yaml=stack-8.6.2.yaml
+  - stack exec hoogle generate --stack-yaml=stack-8.6.2.yaml
   - cd $TRAVIS_BUILD_DIR
   - npm update
   - npm i -g javascript-typescript-langserver