Merge branch 'master' into tdr-test-impls

[lsp-test.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 729bd20fdec694cada5f89850f4246129573a505..c1cf11beaad342911054bcdd2adf88fb9ec4659f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,24 +2,36 @@ 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:
+    packages:
+      - 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'
-
-install:
-  - git clone https://github.com/Bubba/haskell-ide-engine.git --recursive
-  - cd haskell-ide-engine
-  - git checkout 377157dad7641c2c63e8b554a46a4888dca48721
-  - stack --no-terminal --skip-ghc-check install -j1
+  - 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 47b5281d9d8ffe7348f7f7fcb3ce36b4eabd4f06
+  - git submodule init
+  - git submodule sync
+  - git submodule update --init
+  - stack --no-terminal --skip-ghc-check -j2 install
   - stack exec hoogle generate
-  - cd ..
+  - cd $TRAVIS_BUILD_DIR
+  - npm update
+  - npm i -g javascript-typescript-langserver
 
 script:
-  - stack --no-terminal --skip-ghc-check test
+  - stack test