Commit da4766c3 authored by Ben Gamari's avatar Ben Gamari 🐢

circleci: Simplify Hadrian build

This uses the build.sh script included in the Hadrian tree, ensuring that we
will build Cabal from git if necessary.
parent ffdb110a
......@@ -54,17 +54,11 @@ aliases:
name: Build
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment