From 7bd32d70a6c35cab3c3161f03a99176ee961ee03 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Tue, 26 Mar 2019 13:56:49 -0700
Subject: [PATCH] circleci tweaks - mostly diagnostic.

---
 .circleci/config.yml | 45 ++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3f32f5f8c..97499e441 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,26 +45,31 @@ commands:
           command: apt-get install -y cabal-install-2.4
       - run:
           name: install ghc
-          command: apt-get install -y ghc-<< parameters.ghcversion >>
-      - run: |
-          set -e
-          cabal v2-update
-          TMPDIR=`mktemp -d -t circleci.XXXXXXX`
-          cabal v2-sdist --output-dir=${TMPDIR}
-          cd ${TMPDIR}
-          tar xvzf *.tar.gz
-          cd *
-          cabal v2-build -w ghc-<< parameters.ghcversion >> -j2 --dependencies-only --enable-tests --ghc-options="${GHC_OPTS}" all
-          cabal v2-build -w ghc-<< parameters.ghcversion>> -j2 --enable-tests --ghc-options="${GHC_OPTS}" all 2>build.log
-          cat build.log
-          # fail if we had warnings in local build
-          # this is to work around the fact that cabal v2 doesn't allow
-          # us to use -Werror for just local build:
-          # https://github.com/haskell/cabal/issues/4247
-          ! grep -q "warning:" build.log
-          cabal v2-test -w ghc-<< parameters.ghcversion >> --ghc-options="${GHC_OPTS}" 2>build.log
-          cabal v2-haddock -w ghc-<< parameters.ghcversion >> --ghc-options="${GHC_OPTS}"
-          cabal check
+          command: |
+            apt-get install -y ghc-<< parameters.ghcversion >>
+            ghc --version
+            ghc-<< parameters.ghcversion >> --version
+      - run:
+          name: build project
+          command: |
+            set -e
+            cabal v2-update
+            TMPDIR=`mktemp -d -t circleci.XXXXXXX`
+            cabal v2-sdist --output-dir=${TMPDIR}
+            cd ${TMPDIR}
+            tar xvzf *.tar.gz
+            cd *
+            cabal v2-build -j2 --dependencies-only --enable-tests --ghc-options="${GHC_OPTS}" all
+            cabal v2-build -j2 --enable-tests --ghc-options="${GHC_OPTS}" all 2>build.log
+            cat build.log
+            # fail if we had warnings in local build
+            # this is to work around the fact that cabal v2 doesn't allow
+            # us to use -Werror for just local build:
+            # https://github.com/haskell/cabal/issues/4247
+            ! grep -q "warning:" build.log
+            cabal v2-test --ghc-options="${GHC_OPTS}" 2>build.log
+            cabal v2-haddock --ghc-options="${GHC_OPTS}"
+            cabal check
       - *save
 
 #-----------------------------------------------------------------------------