[commit: hadrian] master: Fix Circle CI (#553) (591c425)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/hadrian

On branch  : master
Link       : http://git.haskell.org/hadrian.git/commitdiff/591c4252ec2175c99fce431548c68ae3cd63cbf5

>---------------------------------------------------------------

commit 591c4252ec2175c99fce431548c68ae3cd63cbf5
Author: Zhen Zhang <izgzhen at gmail.com>
Date:   Tue Apr 3 16:52:20 2018 +0800

    Fix Circle CI (#553)


>---------------------------------------------------------------

591c4252ec2175c99fce431548c68ae3cd63cbf5
 circle.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/circle.yml b/circle.yml
index 8ca33cf..66d5193 100644
--- a/circle.yml
+++ b/circle.yml
@@ -8,11 +8,13 @@ dependencies:
   override:
     - brew update
     - brew install ghc cabal-install python3
+    - brew link ghc cabal-install python3
     - cabal update
-    - cabal install alex happy mtl shake quickcheck
+    - cabal install alex 'happy >= 1.19.4' mtl shake QuickCheck
   cache_directories:
-    - $HOME/.cabal
-    - $HOME/.ghc
+    - ~/.cabal
+    - ~/.ghc
+    - /usr/local/Cellar
 
 compile:
   override:
@@ -29,12 +31,14 @@ compile:
     # in CircleCI is a separate process, thus you can't "cd" for the other lines
     - cd ghc/hadrian; git reset --hard HEAD
 
+    - cd ghc; ./boot && PATH=~/.cabal/bin:$PATH ./configure
+
     # XXX: export PATH doesn't work well either, so we use inline env
     # Self test
-    - PATH=$HOME/.cabal/bin:$PATH ghc/hadrian/build.sh -c selftest
+    - PATH=~/.cabal/bin:$PATH ghc/hadrian/build.sh selftest
 
     # Build GHC
-    - PATH=$HOME/.cabal/bin:$PATH ghc/hadrian/build.sh -j -c $MODE --no-progress --progress-colour=never --profile=-
+    - PATH=~/.cabal/bin:$PATH ghc/hadrian/build.sh -j $MODE --no-progress --progress-colour=never --profile=-
 
 test:
   override: