Support GHC 8.10

hedgehogqa · Mar 31, 2020 · fe72da8 · fe72da8
1 parent 6df5655
commit fe72da8
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 96 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.8
+# version: 0.9.20200326
 #
 version: ~> 1.0
 language: c
@@ -29,8 +29,11 @@ before_cache:
   - rm -rfv $CABALHOME/packages/head.hackage
 jobs:
   include:
-    - compiler: ghc-8.8.1
-      addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
+    - compiler: ghc-8.10.1
+      addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.1","cabal-install-3.2"]}}
+      os: linux
+    - compiler: ghc-8.8.3
+      addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.3","cabal-install-3.0"]}}
       os: linux
     - compiler: ghc-8.6.5
       addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
@@ -56,57 +59,31 @@ before_install:
   - TOP=$(pwd)
   - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
   - echo $HCNUMVER
-  - CABAL="$CABAL -vnormal+nowrap+markoutput"
+  - CABAL="$CABAL -vnormal+nowrap"
   - set -o pipefail
-  - |
-    echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }'           >> .colorful.awk
-    echo 'BEGIN { state = "output"; }'                                     >> .colorful.awk
-    echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }'            >> .colorful.awk
-    echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }'             >> .colorful.awk
-    echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
-    echo '  if (state == "cabal") {'                                       >> .colorful.awk
-    echo '    print blue($0)'                                              >> .colorful.awk
-    echo '  } else {'                                                      >> .colorful.awk
-    echo '    print $0'                                                    >> .colorful.awk
-    echo '  }'                                                             >> .colorful.awk
-    echo '}'                                                               >> .colorful.awk
-  - cat .colorful.awk
-  - |
-    color_cabal_output () {
-      awk -f $TOP/.colorful.awk
-    }
-  - echo text | color_cabal_output
-install:
-  - ${CABAL} --version
-  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
   - TEST=--enable-tests
   - BENCH=--enable-benchmarks
   - HEADHACKAGE=false
   - rm -f $CABALHOME/config
   - |
-    echo "verbose: normal +nowrap +markoutput"                                  >> $CABALHOME/config
-    echo "remote-build-reporting: anonymous"                                    >> $CABALHOME/config
-    echo "write-ghc-environment-files: always"                                  >> $CABALHOME/config
-    echo "remote-repo-cache: $CABALHOME/packages"                               >> $CABALHOME/config
-    echo "logs-dir:          $CABALHOME/logs"                                   >> $CABALHOME/config
-    echo "world-file:        $CABALHOME/world"                                  >> $CABALHOME/config
-    echo "extra-prog-path:   $CABALHOME/bin"                                    >> $CABALHOME/config
-    echo "symlink-bindir:    $CABALHOME/bin"                                    >> $CABALHOME/config
-    echo "installdir:        $CABALHOME/bin"                                    >> $CABALHOME/config
-    echo "build-summary:     $CABALHOME/logs/build.log"                         >> $CABALHOME/config
-    echo "store-dir:         $CABALHOME/store"                                  >> $CABALHOME/config
-    echo "install-dirs user"                                                    >> $CABALHOME/config
-    echo "  prefix: $CABALHOME"                                                 >> $CABALHOME/config
-    echo "repository hackage.haskell.org"                                       >> $CABALHOME/config
-    echo "  url: http://hackage.haskell.org/"                                   >> $CABALHOME/config
-    echo "  secure: True"                                                       >> $CABALHOME/config
-    echo "  key-threshold: 3"                                                   >> $CABALHOME/config
-    echo "  root-keys:"                                                         >> $CABALHOME/config
-    echo "    fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >> $CABALHOME/config
-    echo "    1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >> $CABALHOME/config
-    echo "    2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >> $CABALHOME/config
-    echo "    0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >> $CABALHOME/config
-    echo "    51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >> $CABALHOME/config
+    echo "verbose: normal +nowrap +markoutput"          >> $CABALHOME/config
+    echo "remote-build-reporting: anonymous"            >> $CABALHOME/config
+    echo "write-ghc-environment-files: always"          >> $CABALHOME/config
+    echo "remote-repo-cache: $CABALHOME/packages"       >> $CABALHOME/config
+    echo "logs-dir:          $CABALHOME/logs"           >> $CABALHOME/config
+    echo "world-file:        $CABALHOME/world"          >> $CABALHOME/config
+    echo "extra-prog-path:   $CABALHOME/bin"            >> $CABALHOME/config
+    echo "symlink-bindir:    $CABALHOME/bin"            >> $CABALHOME/config
+    echo "installdir:        $CABALHOME/bin"            >> $CABALHOME/config
+    echo "build-summary:     $CABALHOME/logs/build.log" >> $CABALHOME/config
+    echo "store-dir:         $CABALHOME/store"          >> $CABALHOME/config
+    echo "install-dirs user"                            >> $CABALHOME/config
+    echo "  prefix: $CABALHOME"                         >> $CABALHOME/config
+    echo "repository hackage.haskell.org"               >> $CABALHOME/config
+    echo "  url: http://hackage.haskell.org/"           >> $CABALHOME/config
+install:
+  - ${CABAL} --version
+  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
   - |
     echo "program-default-options"                >> $CABALHOME/config
     echo "  ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
@@ -118,48 +95,49 @@ install:
   - touch cabal.project
   - |
     echo "packages: hedgehog" >> cabal.project
+    echo "packages: hedgehog-corpus" >> cabal.project
     echo "packages: hedgehog-dieharder" >> cabal.project
     echo "packages: hedgehog-example" >> cabal.project
     echo "packages: hedgehog-quickcheck" >> cabal.project
     echo "packages: hedgehog-test-laws" >> cabal.project
+  - echo 'package hedgehog' >> cabal.project
+  - "echo '  ghc-options: -Werror=missing-methods' >> cabal.project"
+  - echo 'package hedgehog-corpus' >> cabal.project
+  - "echo '  ghc-options: -Werror=missing-methods' >> cabal.project"
+  - echo 'package hedgehog-dieharder' >> cabal.project
+  - "echo '  ghc-options: -Werror=missing-methods' >> cabal.project"
+  - echo 'package hedgehog-example' >> cabal.project
+  - "echo '  ghc-options: -Werror=missing-methods' >> cabal.project"
+  - echo 'package hedgehog-quickcheck' >> cabal.project
+  - "echo '  ghc-options: -Werror=missing-methods' >> cabal.project"
+  - echo 'package hedgehog-test-laws' >> cabal.project
+  - "echo '  ghc-options: -Werror=missing-methods' >> cabal.project"
   - |
-    echo "package hedgehog"             >> cabal.project
-    echo "  ghc-options: -Wall -Werror" >> cabal.project
-    echo ""                             >> cabal.project
-    echo "package hedgehog-dieharder"   >> cabal.project
-    echo "  ghc-options: -Wall -Werror" >> cabal.project
-    echo ""                             >> cabal.project
-    echo "package hedgehog-example"     >> cabal.project
-    echo "  ghc-options: -Wall -Werror" >> cabal.project
-    echo ""                             >> cabal.project
-    echo "package hedgehog-quickcheck"  >> cabal.project
-    echo "  ghc-options: -Wall -Werror" >> cabal.project
-    echo ""                             >> cabal.project
-    echo "package hedgehog-test-laws"   >> cabal.project
-    echo "  ghc-options: -Wall -Werror" >> cabal.project
-  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(hedgehog|hedgehog-dieharder|hedgehog-example|hedgehog-quickcheck|hedgehog-test-laws)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
+  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(hedgehog|hedgehog-corpus|hedgehog-dieharder|hedgehog-example|hedgehog-quickcheck|hedgehog-test-laws)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true
   - if [ -f "hedgehog/configure.ac" ]; then (cd "hedgehog" && autoreconf -i); fi
+  - if [ -f "hedgehog-corpus/configure.ac" ]; then (cd "hedgehog-corpus" && autoreconf -i); fi
   - if [ -f "hedgehog-dieharder/configure.ac" ]; then (cd "hedgehog-dieharder" && autoreconf -i); fi
   - if [ -f "hedgehog-example/configure.ac" ]; then (cd "hedgehog-example" && autoreconf -i); fi
   - if [ -f "hedgehog-quickcheck/configure.ac" ]; then (cd "hedgehog-quickcheck" && autoreconf -i); fi
   - if [ -f "hedgehog-test-laws/configure.ac" ]; then (cd "hedgehog-test-laws" && autoreconf -i); fi
-  - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
+  - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
   - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
   - rm  cabal.project.freeze
-  - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
-  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
+  - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
+  - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
 script:
   - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
   # Packaging...
-  - ${CABAL} v2-sdist all | color_cabal_output
+  - ${CABAL} v2-sdist all
   # Unpacking...
   - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
   - cd ${DISTDIR} || false
   - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
   - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm       '{}' \;
   - PKGDIR_hedgehog="$(find . -maxdepth 1 -type d -regex '.*/hedgehog-[0-9.]*')"
+  - PKGDIR_hedgehog_corpus="$(find . -maxdepth 1 -type d -regex '.*/hedgehog-corpus-[0-9.]*')"
   - PKGDIR_hedgehog_dieharder="$(find . -maxdepth 1 -type d -regex '.*/hedgehog-dieharder-[0-9.]*')"
   - PKGDIR_hedgehog_example="$(find . -maxdepth 1 -type d -regex '.*/hedgehog-example-[0-9.]*')"
   - PKGDIR_hedgehog_quickcheck="$(find . -maxdepth 1 -type d -regex '.*/hedgehog-quickcheck-[0-9.]*')"
@@ -169,47 +147,47 @@ script:
   - touch cabal.project
   - |
     echo "packages: ${PKGDIR_hedgehog}" >> cabal.project
+    echo "packages: ${PKGDIR_hedgehog_corpus}" >> cabal.project
     echo "packages: ${PKGDIR_hedgehog_dieharder}" >> cabal.project
     echo "packages: ${PKGDIR_hedgehog_example}" >> cabal.project
     echo "packages: ${PKGDIR_hedgehog_quickcheck}" >> cabal.project
     echo "packages: ${PKGDIR_hedgehog_test_laws}" >> cabal.project
+  - echo 'package hedgehog' >> cabal.project
+  - "echo '  ghc-options: -Werror=missing-methods' >> cabal.project"
+  - echo 'package hedgehog-corpus' >> cabal.project
+  - "echo '  ghc-options: -Werror=missing-methods' >> cabal.project"
+  - echo 'package hedgehog-dieharder' >> cabal.project
+  - "echo '  ghc-options: -Werror=missing-methods' >> cabal.project"
+  - echo 'package hedgehog-example' >> cabal.project
+  - "echo '  ghc-options: -Werror=missing-methods' >> cabal.project"
+  - echo 'package hedgehog-quickcheck' >> cabal.project
+  - "echo '  ghc-options: -Werror=missing-methods' >> cabal.project"
+  - echo 'package hedgehog-test-laws' >> cabal.project
+  - "echo '  ghc-options: -Werror=missing-methods' >> cabal.project"
   - |
-    echo "package hedgehog"             >> cabal.project
-    echo "  ghc-options: -Wall -Werror" >> cabal.project
-    echo ""                             >> cabal.project
-    echo "package hedgehog-dieharder"   >> cabal.project
-    echo "  ghc-options: -Wall -Werror" >> cabal.project
-    echo ""                             >> cabal.project
-    echo "package hedgehog-example"     >> cabal.project
-    echo "  ghc-options: -Wall -Werror" >> cabal.project
-    echo ""                             >> cabal.project
-    echo "package hedgehog-quickcheck"  >> cabal.project
-    echo "  ghc-options: -Wall -Werror" >> cabal.project
-    echo ""                             >> cabal.project
-    echo "package hedgehog-test-laws"   >> cabal.project
-    echo "  ghc-options: -Wall -Werror" >> cabal.project
-  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(hedgehog|hedgehog-dieharder|hedgehog-example|hedgehog-quickcheck|hedgehog-test-laws)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
+  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(hedgehog|hedgehog-corpus|hedgehog-dieharder|hedgehog-example|hedgehog-quickcheck|hedgehog-test-laws)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true
   # Building...
   # this builds all libraries and executables (without tests/benchmarks)
-  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
+  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
   # Building with tests and benchmarks...
   # build & run tests, build benchmarks
-  - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
+  - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
   # Testing...
-  - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
+  - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
   # cabal check...
   - (cd ${PKGDIR_hedgehog} && ${CABAL} -vnormal check)
+  - (cd ${PKGDIR_hedgehog_corpus} && ${CABAL} -vnormal check)
   - (cd ${PKGDIR_hedgehog_dieharder} && ${CABAL} -vnormal check)
   - (cd ${PKGDIR_hedgehog_example} && ${CABAL} -vnormal check)
   - (cd ${PKGDIR_hedgehog_quickcheck} && ${CABAL} -vnormal check)
   - (cd ${PKGDIR_hedgehog_test_laws} && ${CABAL} -vnormal check)
   # haddock...
-  - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
+  - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
-  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
+  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
 
-# REGENDATA ("0.8",["cabal.project"])
+# REGENDATA ("0.9.20200326",["cabal.project"])
 # EOF
diff --git a/hedgehog-corpus/hedgehog-corpus.cabal b/hedgehog-corpus/hedgehog-corpus.cabal
@@ -32,7 +32,8 @@ tested-with:
   , GHC == 8.2.2
   , GHC == 8.4.4
   , GHC == 8.6.5
-  , GHC == 8.8.1
+  , GHC == 8.8.3
+  , GHC == 8.10.1
 extra-source-files:
   README.md
 

diff --git a/hedgehog-dieharder/hedgehog-dieharder.cabal b/hedgehog-dieharder/hedgehog-dieharder.cabal
@@ -29,7 +29,8 @@ tested-with:
   , GHC == 8.2.2
   , GHC == 8.4.4
   , GHC == 8.6.5
-  , GHC == 8.8.1
+  , GHC == 8.8.3
+  , GHC == 8.10.1
 
 executable dieharder-input
   main-is:

diff --git a/hedgehog-example/hedgehog-example.cabal b/hedgehog-example/hedgehog-example.cabal
@@ -27,7 +27,8 @@ tested-with:
   , GHC == 8.2.2
   , GHC == 8.4.4
   , GHC == 8.6.5
-  , GHC == 8.8.1
+  , GHC == 8.8.3
+  , GHC == 8.10.1
 
 library
   hs-source-dirs:
@@ -63,7 +64,7 @@ library
     , process                         >= 1.2        && < 1.7
     , QuickCheck                      >= 2.7        && < 2.14
     , resourcet                       >= 1.1        && < 1.3
-    , template-haskell                >= 2.10       && < 2.16
+    , template-haskell                >= 2.10       && < 2.17
     , temporary                       >= 1.3        && < 1.4
     , temporary-resourcet             >= 0.1        && < 0.2
     , text                            >= 1.1        && < 1.3

diff --git a/hedgehog-quickcheck/hedgehog-quickcheck.cabal b/hedgehog-quickcheck/hedgehog-quickcheck.cabal
@@ -37,7 +37,8 @@ tested-with:
   , GHC == 8.2.2
   , GHC == 8.4.4
   , GHC == 8.6.5
-  , GHC == 8.8.1
+  , GHC == 8.8.3
+  , GHC == 8.10.1
 extra-source-files:
   README.md
   CHANGELOG.md

diff --git a/hedgehog-test-laws/hedgehog-test-laws.cabal b/hedgehog-test-laws/hedgehog-test-laws.cabal
@@ -31,7 +31,8 @@ tested-with:
   , GHC == 8.2.2
   , GHC == 8.4.4
   , GHC == 8.6.5
-  , GHC == 8.8.1
+  , GHC == 8.8.3
+  , GHC == 8.10.1
 
 source-repository head
   type: git

diff --git a/hedgehog/hedgehog.cabal b/hedgehog/hedgehog.cabal
@@ -37,7 +37,8 @@ tested-with:
   , GHC == 8.2.2
   , GHC == 8.4.4
   , GHC == 8.6.5
-  , GHC == 8.8.1
+  , GHC == 8.8.3
+  , GHC == 8.10.1
 extra-source-files:
   README.md
   CHANGELOG.md
@@ -69,7 +70,7 @@ library
     , resourcet                       >= 1.1        && < 1.3
     , semigroups                      >= 0.16       && < 0.20
     , stm                             >= 2.4        && < 2.6
-    , template-haskell                >= 2.10       && < 2.16
+    , template-haskell                >= 2.10       && < 2.17
     , text                            >= 1.1        && < 1.3
     , time                            >= 1.4        && < 1.10
     , transformers                    >= 0.5        && < 0.6