From 2c3b8cd6d29c057e0088a15e7ee5b70eba5e7b79 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 27 Mar 2019 07:30:37 -0700 Subject: circleci - ensure that config doesn't change between build and test. Print test output directly. --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.circleci') diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d562b2a6..317a3b4dc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,7 +48,7 @@ commands: command: | apt-get install -y ghc-<< parameters.ghcversion >> - run: - name: build project + name: build and test project command: | set -e cabal v2-update @@ -59,14 +59,14 @@ commands: 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 - cabal v2-test -w ghc-<< parameters.ghcversion >> --ghc-options="${GHC_OPTS}" 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-haddock -w ghc-<< parameters.ghcversion >> --ghc-options="${GHC_OPTS}" + cabal v2-test -w ghc-<< parameters.ghcversion >> -j2 --ghc-options="${GHC_OPTS}" all + cabal v2-haddock -w ghc-<< parameters.ghcversion >> -j2 --ghc-options="${GHC_OPTS}" all cabal check - *save -- cgit v1.2.3