X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=.travis.yml;h=28d6795f31917cee8cbd8a15be40d96288361018;hb=f9f9ca638086c57558a2cd0029a67142f4b10b5a;hp=c677e482f543cfbe6c2bf26f3e2f3e4c6917b78b;hpb=d25de2bf28d472df5d1d3e050090d243247dab1b;p=opengl.git

diff --git a/.travis.yml b/.travis.yml
index c677e48..28d6795 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,12 @@
-language: javascript
+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
 
 addons:
   apt:
@@ -13,21 +14,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'
-  - npm update
-
-install:
-  - git clone https://github.com/Bubba/haskell-ide-engine.git --recursive
-  - cd haskell-ide-engine
-  - git checkout pid-commands
-  - git submodule update
-  - stack --no-terminal --skip-ghc-check install -j2
+  - 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 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
+  - hie --version
+  - npm update
   - npm i -g javascript-typescript-langserver
 
 script:
-  - stack --no-terminal --skip-ghc-check test
+  - stack test