X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=.travis.yml;h=eecf45059799b835b2a43c7ff8390fcd6fd3ee48;hb=e7b69115e8be01d9eecac37d35e4f17f584abb5d;hp=cf425d1e3b192eeebea52b1d56b6664b72a7bb8b;hpb=4b363ee527121d080478c5614cd7ba9ef1804d3d;p=lsp-test.git

diff --git a/.travis.yml b/.travis.yml
index cf425d1..eecf450 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,45 +9,36 @@ sudo: false
 cache:
   directories:
   # - $HOME/.stack
-  # - $HOME/haskell-ide-engine/.stack-work
+  - $HOME/haskell-ide-engine/dist
+  - $HOME/haskell-ide-engine/dist-newstyle
 
 addons:
   apt:
     packages:
     - npm
+    - hoogle
 
 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
-  - mkdir -p haskell-ide-engine
-  - cd haskell-ide-engine
-  - git init
-  - git remote add origin https://github.com/Bubba/haskell-ide-engine.git
-  - git pull origin heirarchal-document-symbols
-  - git submodule init
-  - git submodule sync
-  - git submodule update
-  - cabal new-configure
-  - cabal new-build -j2
-  # - export PATH=$HOME/haskell-ide-engine/dist-newstyle/build/*/ghc-*/haskell-ide-engine-*/x/hie/build:$PATH
-  - cp `find dist-newstyle/ -name hie -type f | xargs -x ls -t | head -n1` $HOME/.cabal/bin/
-  # - stack --no-terminal --skip-ghc-check install -j2
-  # - stack exec hoogle generate
-  - cabal install hoogle
-  - hoogle generate
-  - cd $TRAVIS_BUILD_DIR
+  - sh .download-hie.sh
+  - export PATH=$TRAVIS_BUILD_DIR:$PATH
+  # - mkdir -p haskell-ide-engine
+  # - cd haskell-ide-engine
+  # - git init
+  # - git remote add origin https://github.com/Bubba/haskell-ide-engine.git
+  # - git pull origin heirarchal-document-symbols
+  # - git submodule init
+  # - git submodule sync
+  # - git submodule update
+  # - cabal new-configure
+  # - cabal new-build -j2
+  # - export PATH=$HOME/haskell-ide-engine/dist-newstyle/build/*/ghc-*/haskell-ide-engine-*/c/hie/build/hie/hie:$PATH
   - npm update
   - npm i -g javascript-typescript-langserver
 
 script:
+  - hoogle generate
   - cabal configure --enable-tests --enable-coverage
-  - cabal build
   - cabal test --show-details=streaming
 after_script:
-  - cabal install codecov-haskell
-  - codecov-haskell [options] tests
+  - cabal install codecov-haskell --bindir=$TRAVIS_BUILD_DIR
+  - ./codecov-haskell