Merge pull request #27 from haskell-works/direct-test-output-and-gene…

…rate-environment-files Direct test output and generate environment files
haskell-works · Dec 2, 2019 · e69d76c · e69d76c
2 parents 08ee323 + baae8d9
commit e69d76c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,24 +13,32 @@ workflows:
           executor: haskell/ghc-8_2_2
           context: haskell-ci
           binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
+          cabal-build-extra: --write-ghc-environment-files=ghc8.4.4+
+          cabal-test-extra: --test-show-details=direct
 
       - haskell/build-with-binary-cache:
           name: GHC 8.4.4
           executor: haskell/ghc-8_4_4
           context: haskell-ci
           binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
+          cabal-build-extra: --write-ghc-environment-files=ghc8.4.4+
+          cabal-test-extra: --test-show-details=direct
 
       - haskell/build-with-binary-cache:
           name: GHC 8.6.5
           executor: haskell/ghc-8_6_5
           context: haskell-ci
           binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
+          cabal-build-extra: --write-ghc-environment-files=ghc8.4.4+
+          cabal-test-extra: --test-show-details=direct
 
       - haskell/build-with-binary-cache:
           name: GHC 8.8.1
           executor: haskell/ghc-8_8_1
           context: haskell-ci
           binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
+          cabal-build-extra: --write-ghc-environment-files=ghc8.4.4+
+          cabal-test-extra: --test-show-details=direct
 
       - github/release-cabal:
           name: GitHub Release

diff --git a/project.sh b/project.sh
@@ -26,7 +26,7 @@ case "$cmd" in
     ;;
 
   test)
-    cabal new-test -j8 --enable-tests --disable-documentation \
+    cabal v2-test -j8 --enable-tests --test-show-details=direct \
       $CABAL_FLAGS "$@"
     ;;