circleci: Simplify Hadrian build
authorBen Gamari <ben@smart-cactus.org>
Mon, 26 Feb 2018 16:37:44 +0000 (11:37 -0500)
committerBen Gamari <ben@smart-cactus.org>
Mon, 26 Feb 2018 19:41:14 +0000 (14:41 -0500)
This uses the build.sh script included in the Hadrian tree, ensuring that we
will build Cabal from git if necessary.

.circleci/config.yml

index e4f09a3..295d803 100644 (file)
@@ -55,16 +55,10 @@ aliases:
       command: "make -j$THREADS"
   - &build_hadrian
     run:
-      name: Build Hadrian
-      command: |
-        cd hadrian
-        cabal update
-        cabal install
-  - &build_ghc_hadrian
-    run:
       name: Build GHC using Hadrian
       command: |
-        $HOME/.cabal/bin/hadrian -j$THREADS
+        cabal update
+        hadrian/build.sh -j$THREADS
   - &test
     run:
       name: Test
@@ -169,7 +163,6 @@ jobs:
       - *boot
       - *configure_unix
       - *build_hadrian
-      - *build_ghc_hadrian
 
   "validate-x86_64-linux-unreg":
     resource_class: xlarge