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

diff --git a/.travis.yml b/.travis.yml
index 7b42502..f26edb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,40 +7,40 @@ os:
 - 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:
-      - haskell-stack
       - npm
-    update: true
   homebrew:
     packages:
       - haskell-stack
       - npm
 
 before_install:
-  - mkdir -p ~/.local/bin
-  - export PATH=$HOME/.local/bin:$PATH
-  - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install haskell-stack; fi
-  # - 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; /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 --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