diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-02-26 11:37:44 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-02-26 14:41:14 -0500 |
| commit | da4766c313bf33e5f0790583af204935f62699a0 (patch) | |
| tree | 3bc56655067cfb3e28fe95a4b238c3430dca4fdf /.circleci | |
| parent | ffdb110a7f71b29f30adab7fea794b9f070a8e75 (diff) | |
| download | haskell-da4766c313bf33e5f0790583af204935f62699a0.tar.gz | |
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.
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index e4f09a3a25..295d803a6f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 |