From: Luke Lau <luke_lau@icloud.com>
Date: Tue, 31 Jul 2018 10:36:27 +0000 (+0100)
Subject: Merge branch 'master' into travis-investigation
X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=19f8f8c406d50454b79fdc3dd669d4090a06ae1d;hp=82a682ce648c48c890949ad67fc22900448dc94e

Merge branch 'master' into travis-investigation
---

diff --git a/.travis.yml b/.travis.yml
index a85c52a..3f1c540 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ sudo: false
 cache:
   directories:
   - $HOME/.stack
+  - $HOME/haskell-ide-engine
 
 addons:
   apt:
@@ -22,20 +23,25 @@ before_install:
   - export PATH=$HOME/.local/bin:$PATH
   - travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
     
-  - git clone https://github.com/haskell/haskell-ide-engine.git --recursive
+  - cd $HOME
+  # It's ok to fail
+  - git clone https://github.com/haskell/haskell-ide-engine.git --recursive || true
   - cd haskell-ide-engine
+  - git pull
   - git submodule sync
   - git submodule update
   # - cabal new-update
   # - cabal new-configure
   # - cabal new-build
-  # - export PATH=dist-newstyle/build/*/ghc-*/haskell-ide-engine-*/x/hie/build:$PATH
+  # - export PATH=$HOME/dist-newstyle/build/*/ghc-*/haskell-ide-engine-*/x/hie/build:$PATH
   - stack --no-terminal --skip-ghc-check install -j2
   - stack exec hoogle generate
-  - cd ..
+  - cd $TRAVIS_BUILD_DIR
   - npm update
   - npm i -g javascript-typescript-langserver
 
 script:
+  - pwd
+  - ls -a
   - cabal new-configure
   - cabal new-test -O2