X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=blobdiff_plain;f=.travis.yml;h=4d2f4e3c095d8e03398bfa182ec640645a85b348;hp=25a5e69462fbd1bd4f16fa8b534cd4fd595cefd8;hb=ce55dc2f6440cf12e2d50a3dabcc673c3682cd8e;hpb=1519d72b72435e798b02bb698eccab8f9683dec1

diff --git a/.travis.yml b/.travis.yml
index 25a5e69..4d2f4e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,13 @@
-# language: haskell
-# ghc:
-#   - "8.2.2"
-#   - "8.4.2"
 language: c
 
 sudo: false
 
-# Caching so the next build will be fast too.
 cache:
   directories:
+    - .stack-work
     - $HOME/.stack
     - $HOME/haskell-ide-engine/.stack-work
+  timeout: 1000
 
 addons:
   apt:
@@ -18,31 +15,23 @@ addons:
       - npm
 
 before_install:
-  # Download and unpack the stack executable
   - mkdir -p ~/.local/bin
   - 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'
-    
-  - cd $HOME
-  # It's ok to fail
-  - cd haskell-ide-engine
+  - mkdir -p haskell-ide-engine
+  - cd $HOME/haskell-ide-engine
   - git init
-  - git remote add origin https://github.com/Bubba/haskell-ide-engine.git
-  - git pull origin heirarchal-document-symbols
+  - git remote add origin https://github.com/haskell/haskell-ide-engine.git
+  - git pull origin master
   - git submodule init
   - git submodule sync
-  - git submodule update
-  # - cabal new-update
-  # - cabal new-configure
-  # - cabal new-build
-  # - export PATH=$HOME/haskell-ide-engine/dist-newstyle/build/*/ghc-*/haskell-ide-engine-*/x/hie/build:$PATH
-  - stack --no-terminal --skip-ghc-check install -j2
+  - git submodule update --init
+  - stack --no-terminal --skip-ghc-check -j2 install
   - stack exec hoogle generate
   - cd $TRAVIS_BUILD_DIR
+  - hie --version
   - npm update
   - npm i -g javascript-typescript-langserver
 
 script:
   - stack test
-  # - cabal configure --enable-tests
-  # - cabal test -j2 --show-details=streaming