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

diff --git a/.travis.yml b/.travis.yml
index 8772ea1..28d6795 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,10 @@
-# 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
 
@@ -18,31 +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'
-    
-  - 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/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