X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=.travis.yml;h=2c24b5be7b7d8afb297496f9e4308e091df6b40e;hb=081b93c29d989f48f08295cef030978f2fe30746;hp=fcf2b2ad7925050887d97a924e00fa8853815a5c;hpb=2fd047f9a3088ebce9a6496bd7d18b9c5dab8c2f;p=lsp-test.git

diff --git a/.travis.yml b/.travis.yml
index fcf2b2a..2c24b5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,21 +7,21 @@ os:
 - linux
 - osx
 
+dist: xenial
+
 cache:
   directories:
     - .stack-work
     - $HOME/.stack
     - $HOME/haskell-ide-engine/.stack-work
-    - %APPDATA%\Local\Programs\stack
-    - C:\sr
+    - C:/Users/travis/AppData/Local/Programs/stack
+    - C:/sr
   timeout: 1000
 
 addons:
   apt:
     packages:
-      - haskell-stack
       - npm
-    update: true
   homebrew:
     packages:
       - haskell-stack
@@ -30,19 +30,19 @@ 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 npm 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
   - 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