git.iko.soy/servant-quickcheck
on master help sign in
Merge pull request #66 from haskell-servant/updates

Updates: 2019-09

commitc93bd5a832925f53f45bd2e307c3515005261743 authorOleg Grenrus <oleg.grenrus@iki.fi> dateMon 16 Sep 2019, 02:09 (7 years ago) parentf6fb903f9989bb
5 files changed+64−34
.travis.yml+41−26 CHANGELOG.yaml+6 cabal.haskell-ci+7 cabal.project+2 servant-quickcheck.cabal+8−8
.travis.yml+41−26
@@ -1,10 +1,10 @@
11# This Travis job script has been generated by a script via
22#
3−# haskell-ci '--branches' 'master' '-o' '.travis.yml' 'servant-quickcheck.cabal'
3+# haskell-ci '--config=cabal.haskell-ci' 'servant-quickcheck.cabal'
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
7−# version: 0.3.20190413
7+# version: 0.5.20190908
88#
99language: c
1010dist: xenial
@@ -29,23 +29,27 @@ before_cache:
2929 - rm -rfv $CABALHOME/packages/head.hackage
3030matrix:
3131 include:
32− - compiler: ghc-8.6.4
33− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.4","cabal-install-2.4"]}}
32+ - compiler: ghc-8.8.1
33+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
34+ - compiler: ghc-8.6.5
35+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
3436 - compiler: ghc-8.4.4
35− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
37+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
3638 - compiler: ghc-8.2.2
37− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
39+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
3840 - compiler: ghc-8.0.2
39− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
41+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
4042before_install:
4143 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
44+ - WITHCOMPILER="-w $HC"
45+ - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
4246 - HCPKG="$HC-pkg"
4347 - unset CC
4448 - CABAL=/opt/ghc/bin/cabal
4549 - CABALHOME=$HOME/.cabal
4650 - export PATH="$CABALHOME/bin:$PATH"
4751 - TOP=$(pwd)
48− - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
52+ - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
4953 - echo $HCNUMVER
5054 - CABAL="$CABAL -vnormal+nowrap+markoutput"
5155 - set -o pipefail
@@ -72,22 +76,27 @@ install:
7276 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
7377 - TEST=--enable-tests
7478 - BENCH=--enable-benchmarks
75− - GHCHEAD=${GHCHEAD-false}
79+ - HEADHACKAGE=false
7680 - rm -f $CABALHOME/config
7781 - |
7882 echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
7983 echo "remote-build-reporting: anonymous" >> $CABALHOME/config
84+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
8085 echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
8186 echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
8287 echo "world-file: $CABALHOME/world" >> $CABALHOME/config
8388 echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
8489 echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
90+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
8591 echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
8692 echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
8793 echo "install-dirs user" >> $CABALHOME/config
8894 echo " prefix: $CABALHOME" >> $CABALHOME/config
8995 echo "repository hackage.haskell.org" >> $CABALHOME/config
9096 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
97+ - |
98+ echo "program-default-options" >> $CABALHOME/config
99+ echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
91100 - cat $CABALHOME/config
92101 - rm -fv cabal.project cabal.project.local cabal.project.freeze
93102 - travis_retry ${CABAL} v2-update -v
@@ -95,18 +104,17 @@ install:
95104 - rm -rf cabal.project cabal.project.local cabal.project.freeze
96105 - touch cabal.project
97106 - |
98− echo 'packages: "."' >> cabal.project
107+ echo "packages: ." >> cabal.project
99108 - |
100− echo "write-ghc-environment-files: always" >> cabal.project
101− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(servant-quickcheck)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
109+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-quickcheck)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
102110 - cat cabal.project || true
103111 - cat cabal.project.local || true
104112 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
105− - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
113+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
106114 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
107115 - rm cabal.project.freeze
108− - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
109− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
116+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
117+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
110118script:
111119 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
112120 # Packaging...
@@ -114,32 +122,39 @@ script:
114122 # Unpacking...
115123 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
116124 - cd ${DISTDIR} || false
117− - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
125+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
126+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
127+ - PKGDIR_servant_quickcheck="$(find . -maxdepth 1 -type d -regex '.*/servant-quickcheck-[0-9.]*')"
118128 # Generate cabal.project
119129 - rm -rf cabal.project cabal.project.local cabal.project.freeze
120130 - touch cabal.project
121131 - |
122− echo 'packages: "servant-quickcheck-*/*.cabal"' >> cabal.project
132+ echo "packages: ${PKGDIR_servant_quickcheck}" >> cabal.project
123133 - |
124− echo "write-ghc-environment-files: always" >> cabal.project
125− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(servant-quickcheck)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
134+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-quickcheck)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
126135 - cat cabal.project || true
127136 - cat cabal.project.local || true
128137 # Building...
129138 # this builds all libraries and executables (without tests/benchmarks)
130− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
139+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
131140 # Building with tests and benchmarks...
132141 # build & run tests, build benchmarks
133− - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
142+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
134143 # Testing...
135− - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
144+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
136145 # cabal check...
137− - (cd servant-quickcheck-* && ${CABAL} -vnormal check)
146+ - (cd ${PKGDIR_servant_quickcheck} && ${CABAL} -vnormal check)
138147 # haddock...
139− - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
148+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
140149 # Building without installed constraints for packages in global-db...
141150 - rm -f cabal.project.local
142− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
151+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
152+ # Constraint sets
153+ - rm -rf cabal.project.local
154+ # Constraint set base-compat-0.10
155+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.10.*' all | color_cabal_output
156+ # Constraint set base-compat-0.11
157+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.11.*' all | color_cabal_output
143158
144−# REGENDATA ["--branches","master","-o",".travis.yml","servant-quickcheck.cabal"]
159+# REGENDATA ["--config=cabal.haskell-ci","servant-quickcheck.cabal"]
145160# EOF
CHANGELOG.yaml+6
@@ -1,5 +1,11 @@
11releases:
22
3+ - version: "0.8"
4+ changes:
5+ - description: Support GHC-8.8. Allow newer versions of other dependencies.
6+ authors: phadej
7+ date: 2019-09-15
8+
39 - version: "0.0.7.3"
410 changes:
511 - description: Support for servant-0.14
cabal.haskell-cinew file+7
@@ -0,0 +1,7 @@
1+branches: master
2+
3+constraint-set base-compat-0.10
4+ constraints: base-compat ==0.10.*
5+
6+constraint-set base-compat-0.11
7+ constraints: base-compat ==0.11.*
cabal.projectnew file+2
@@ -0,0 +1,2 @@
1+packages: .
2+tests: true
servant-quickcheck.cabal+8−8
@@ -1,5 +1,5 @@
11name: servant-quickcheck
2−version: 0.0.7.4
2+version: 0.0.8
33synopsis: QuickCheck entire APIs
44description:
55 This packages provides QuickCheck properties that are tested across an entire
@@ -13,7 +13,7 @@ category: Web
1313build-type: Simple
1414cabal-version: >=1.10
1515extra-source-files: CHANGELOG.yaml
16−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.4
16+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || == 8.8.1
1717
1818source-repository head
1919 type: git
@@ -35,11 +35,11 @@ library
3535
3636 build-depends:
3737 aeson >=0.8 && <2
38− , base >=4.9 && <4.13
39− , base-compat-batteries >=0.10.1 && <0.11
38+ , base >=4.9 && <4.14
39+ , base-compat-batteries >=0.10.1 && <0.12
4040 , bytestring >=0.10 && <0.11
4141 , case-insensitive >=1.2 && <1.3
42− , clock >=0.7 && <0.8
42+ , clock >=0.7 && <0.9
4343 , data-default-class >=0.0 && <0.2
4444 , hspec >=2.5.6 && <2.8
4545 , http-client >=0.4.30 && <0.7
@@ -56,11 +56,11 @@ library
5656 , string-conversions >=0.3 && <0.5
5757 , temporary >=1.2 && <1.4
5858 , text >=1 && <2
59− , time >=1.5 && <1.9
60− , warp >=3.2.4 && <3.3
59+ , time >=1.5 && <1.10
60+ , warp >=3.2.4 && <3.4
6161
6262 if !impl(ghc >=8.0)
63− build-depends: semigroups >=0.18.3 && <0.19
63+ build-depends: semigroups >=0.18.3 && <0.20
6464
6565 hs-source-dirs: src
6666 default-extensions: