From 3d7bb0f81f9be18db2f6bd51e8a7dac1133f09e8 Mon Sep 17 00:00:00 2001 From: John Ky Date: Fri, 10 Apr 2020 17:49:49 +1000 Subject: [PATCH 1/3] Support ghc-8.10.1 --- .circleci/config.yml | 9 +++++++++ hw-all.cabal | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 27f453a..d290dfc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,12 +33,21 @@ workflows: 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.10.1 + executor: haskell/ghc-8_10_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 + - merge-point/merge-point: name: Build Ok requires: - GHC 8.4.4 - GHC 8.6.5 - GHC 8.8.3 + - GHC 8.10.1 - github/release-cabal: name: GitHub Release diff --git a/hw-all.cabal b/hw-all.cabal index e4b4e9d..a3adf90 100644 --- a/hw-all.cabal +++ b/hw-all.cabal @@ -11,7 +11,7 @@ author: John Ky maintainer: newhoggy@gmail.com copyright: 2016-2020 John Ky category: Data, Conduit -tested-with: GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4 +tested-with: GHC == 8.10.1, GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4 build-type: Simple extra-source-files: README.md From fa6970b3f782b2e1b057df80458b0ba89d1b8311 Mon Sep 17 00:00:00 2001 From: John Ky Date: Tue, 14 Apr 2020 23:47:30 +1000 Subject: [PATCH 2/3] Disable parallel garbage colllector in CCI tests --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d290dfc..254dcf1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ workflows: 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 + cabal-test-extra: --test-show-details=direct --test-options='+RTS -g1' - haskell/build-with-binary-cache: name: GHC 8.6.5 @@ -23,7 +23,7 @@ workflows: 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 + cabal-test-extra: --test-show-details=direct --test-options='+RTS -g1' - haskell/build-with-binary-cache: name: GHC 8.8.3 @@ -31,7 +31,7 @@ workflows: 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 + cabal-test-extra: --test-show-details=direct --test-options='+RTS -g1' - haskell/build-with-binary-cache: name: GHC 8.10.1 @@ -39,7 +39,7 @@ workflows: 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 + cabal-test-extra: --test-show-details=direct --test-options='+RTS -g1' - merge-point/merge-point: name: Build Ok From 042d9ce9a61e0e41711990b3e1343c3965674568 Mon Sep 17 00:00:00 2001 From: John Ky Date: Wed, 15 Apr 2020 01:22:43 +1000 Subject: [PATCH 3/3] Disable parallel garbage collector from project.sh test --- project.sh | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100755 project.sh diff --git a/project.sh b/project.sh new file mode 100755 index 0000000..d3cf215 --- /dev/null +++ b/project.sh @@ -0,0 +1,84 @@ +#!/usr/bin/env bash + +CABAL_FLAGS="-j8" + +cmd="$1" + +shift + +cabal-install() { + cabal v2-install \ + -j8 \ + --installdir="$HOME/.local/bin" \ + --overwrite-policy=always \ + --disable-documentation \ + $CABAL_FLAGS "$@" +} + +cabal-build() { + cabal v2-build \ + --enable-tests \ + --write-ghc-environment-files=ghc8.4.4+ \ + $CABAL_FLAGS "$@" +} + +cabal-test() { + cabal v2-test \ + --enable-tests \ + --test-show-details=direct \ + --test-options='+RTS -g1' \ + $CABAL_FLAGS "$@" +} + +cabal-exec() { + cabal v2-exec "$(echo *.cabal | cut -d . -f 1)" "$@" +} + +cabal-bench() { + cabal v2-bench -j8 \ + $CABAL_FLAGS "$@" +} + +cabal-repl() { + cabal v2-repl \ + $CABAL_FLAGS "$@" +} + +cabal-clean() { + cabal v2-clean +} + +case "$cmd" in + install) + cabal-install + ;; + + build) + cabal-build + ;; + + exec) + cabal-exec + ;; + + test) + cabal-build + cabal-test + ;; + + bench) + cabal-bench + ;; + + repl) + cabal-repl + ;; + + clean) + cabal-clean + ;; + + *) + echo "Unrecognised command: $cmd" + exit 1 +esac