X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=.travis.yml;h=d2cfa2e6f409cbfb033dbb58889893066a3db023;hb=d356140fee78fb2ef8efcf50805280c53cb3232b;hp=1ca12ce6ac76f132a9a41fe6992e2effab739f24;hpb=36a697113f3b8c2d620e703e4c4bef593e1bb37d;p=lsp-test.git

diff --git a/.travis.yml b/.travis.yml
index 1ca12ce..d2cfa2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: haskell
 ghc:
   - "8.2.2"
-  - "8.4.2"
+  - "8.4.3"
 
 sudo: false
 
@@ -10,8 +10,8 @@ cache:
   directories:
   - dist
   - dist-newstyle
-  # - $HOME/.stack
-  # - $HOME/haskell-ide-engine/.stack-work
+  - $HOME/.stack
+  - $HOME/haskell-ide-engine/.stack-work
 
 addons:
   apt:
@@ -19,34 +19,36 @@ 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
+  - printenv
+  - 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'
+  - stack config set system-ghc --global true
+  # - export PATH=/opt/ghc/8.4.3/bin:$PATH
+  # - sh .download-hie.sh
+  # - export PATH=$TRAVIS_BUILD_DIR:$PATH
+  # - hie version
   - mkdir -p haskell-ide-engine
-  - cd 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
-  - 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
+  - git submodule update --init
+  - stack --no-terminal --skip-ghc-check -j2 install --stack-yaml=stack-$TRAVIS_HASKELL_VERSION.yaml
+  - stack exec hoogle generate
   - cd $TRAVIS_BUILD_DIR
+  - hie --version
+  # - 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:
-  - cabal configure --enable-tests --enable-coverage
+  - cabal configure --enable-tests
   - cabal test --show-details=streaming