Use stack again for hie

diff --git a/.download-hie.sh b/.download-hie.sh
deleted file mode 100644 (file)
index a502b16..0000000
--- a/.download-hie.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-case `ghc --version` in
-       *8.4.3*) wget https://877-129435383-gh.circle-artifacts.com/0/bin/hie;;
-       *8.2.2*) wget https://878-129435383-gh.circle-artifacts.com/0/bin/hie;;
-esac
-chmod u+x hie

diff --git a/.travis.yml b/.travis.yml
index 70ddfbd6bb8ddffc9f079c157c7b579fcf7a98c9..9d023f87de5c92c19397b697060b39463499060b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,8 @@ cache:
   directories:
   - dist
   - dist-newstyle
-  # - $HOME/.stack
-  - $HOME/haskell-ide-engine/dist
-  - $HOME/haskell-ide-engine/dist-newstyle
+  - $HOME/.stack
+  - $HOME/haskell-ide-engine/.stack-work
 
 addons:
   apt:
@@ -21,14 +20,22 @@ addons:
     - hoogle
 
 before_install:
-  - sh .download-hie.sh
-  - export PATH=$TRAVIS_BUILD_DIR:$PATH
-  - hie version
-  # - 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
+  - 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 $HOME/haskell-ide-engine
+  - git init
+  - git remote add origin https://github.com/haskell/haskell-ide-engine.git
+  - git pull
+  - stack --no-terminal install
+  - cd $TRAVIS_BUILD_DIR
   # - git submodule init
   # - git submodule sync
   # - git submodule update