git.iko.soy/servant-quickcheck
on master help sign in
Updates: 2019-09
f9989bbOleg Grenrus
.travis.yml+41−26
compare with master
unifiedsplit
@@ -1,10 +1,10 @@
1# This Travis job script has been generated by a script via
1# This Travis job script has been generated by a script via
2#
2#
3−# haskell-ci '--branches' 'master' '-o' '.travis.yml' 'servant-quickcheck.cabal'
3+# haskell-ci '--config=cabal.haskell-ci' 'servant-quickcheck.cabal'
4#
4#
5# For more information, see https://github.com/haskell-CI/haskell-ci
5# For more information, see https://github.com/haskell-CI/haskell-ci
6#
6#
7−# version: 0.3.20190413
7+# version: 0.5.20190908
8#
8#
9language: c
9language: c
10dist: xenial
10dist: xenial
@@ -29,23 +29,27 @@ before_cache:
29 - rm -rfv $CABALHOME/packages/head.hackage
29 - rm -rfv $CABALHOME/packages/head.hackage
30matrix:
30matrix:
31 include:
31 include:
32− - compiler: ghc-8.6.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
33− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.4","cabal-install-2.4"]}}
35+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
34 - compiler: ghc-8.4.4
36 - 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"]}}
36 - compiler: ghc-8.2.2
38 - 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"]}}
38 - compiler: ghc-8.0.2
40 - 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"]}}
40before_install:
42before_install:
41 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
43 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
44+ - WITHCOMPILER="-w $HC"
45+ - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
42 - HCPKG="$HC-pkg"
46 - HCPKG="$HC-pkg"
43 - unset CC
47 - unset CC
44 - CABAL=/opt/ghc/bin/cabal
48 - CABAL=/opt/ghc/bin/cabal
45 - CABALHOME=$HOME/.cabal
49 - CABALHOME=$HOME/.cabal
46 - export PATH="$CABALHOME/bin:$PATH"
50 - export PATH="$CABALHOME/bin:$PATH"
47 - TOP=$(pwd)
51 - 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))')"
49 - echo $HCNUMVER
53 - echo $HCNUMVER
50 - CABAL="$CABAL -vnormal+nowrap+markoutput"
54 - CABAL="$CABAL -vnormal+nowrap+markoutput"
51 - set -o pipefail
55 - set -o pipefail
@@ -72,22 +76,27 @@ install:
72 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
76 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
73 - TEST=--enable-tests
77 - TEST=--enable-tests
74 - BENCH=--enable-benchmarks
78 - BENCH=--enable-benchmarks
75− - GHCHEAD=${GHCHEAD-false}
79+ - HEADHACKAGE=false
76 - rm -f $CABALHOME/config
80 - rm -f $CABALHOME/config
77 - |
81 - |
78 echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
82 echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
79 echo "remote-build-reporting: anonymous" >> $CABALHOME/config
83 echo "remote-build-reporting: anonymous" >> $CABALHOME/config
84+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
80 echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
85 echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
81 echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
86 echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
82 echo "world-file: $CABALHOME/world" >> $CABALHOME/config
87 echo "world-file: $CABALHOME/world" >> $CABALHOME/config
83 echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
88 echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
84 echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
89 echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
90+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
85 echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
91 echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
86 echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
92 echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
87 echo "install-dirs user" >> $CABALHOME/config
93 echo "install-dirs user" >> $CABALHOME/config
88 echo " prefix: $CABALHOME" >> $CABALHOME/config
94 echo " prefix: $CABALHOME" >> $CABALHOME/config
89 echo "repository hackage.haskell.org" >> $CABALHOME/config
95 echo "repository hackage.haskell.org" >> $CABALHOME/config
90 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
96 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
91 - cat $CABALHOME/config
100 - cat $CABALHOME/config
92 - rm -fv cabal.project cabal.project.local cabal.project.freeze
101 - rm -fv cabal.project cabal.project.local cabal.project.freeze
93 - travis_retry ${CABAL} v2-update -v
102 - travis_retry ${CABAL} v2-update -v
@@ -95,18 +104,17 @@ install:
95 - rm -rf cabal.project cabal.project.local cabal.project.freeze
104 - rm -rf cabal.project cabal.project.local cabal.project.freeze
96 - touch cabal.project
105 - touch cabal.project
97 - |
106 - |
98− echo 'packages: "."' >> cabal.project
107+ echo "packages: ." >> cabal.project
99 - |
108 - |
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"
102 - cat cabal.project || true
110 - cat cabal.project || true
103 - cat cabal.project.local || true
111 - cat cabal.project.local || true
104 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
112 - 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
106 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
114 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
107 - rm cabal.project.freeze
115 - rm cabal.project.freeze
108− - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
116+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
109− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
117+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
110script:
118script:
111 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
119 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
112 # Packaging...
120 # Packaging...
@@ -114,32 +122,39 @@ script:
114 # Unpacking...
122 # Unpacking...
115 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
123 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
116 - cd ${DISTDIR} || false
124 - 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.]*')"
118 # Generate cabal.project
128 # Generate cabal.project
119 - rm -rf cabal.project cabal.project.local cabal.project.freeze
129 - rm -rf cabal.project cabal.project.local cabal.project.freeze
120 - touch cabal.project
130 - touch cabal.project
121 - |
131 - |
122− echo 'packages: "servant-quickcheck-*/*.cabal"' >> cabal.project
132+ echo "packages: ${PKGDIR_servant_quickcheck}" >> cabal.project
123 - |
133 - |
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"
126 - cat cabal.project || true
135 - cat cabal.project || true
127 - cat cabal.project.local || true
136 - cat cabal.project.local || true
128 # Building...
137 # Building...
129 # this builds all libraries and executables (without tests/benchmarks)
138 # 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
131 # Building with tests and benchmarks...
140 # Building with tests and benchmarks...
132 # build & run tests, build benchmarks
141 # 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
134 # Testing...
143 # Testing...
135− - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
144+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
136 # cabal check...
145 # cabal check...
137− - (cd servant-quickcheck-* && ${CABAL} -vnormal check)
146+ - (cd ${PKGDIR_servant_quickcheck} && ${CABAL} -vnormal check)
138 # haddock...
147 # 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
140 # Building without installed constraints for packages in global-db...
149 # Building without installed constraints for packages in global-db...
141 - rm -f cabal.project.local
150 - rm -f cabal.project.local
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
142− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
157+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.11.*' all | color_cabal_output
143
158
144−# REGENDATA ["--branches","master","-o",".travis.yml","servant-quickcheck.cabal"]
159+# REGENDATA ["--config=cabal.haskell-ci","servant-quickcheck.cabal"]
145# EOF
160# EOF
CHANGELOG.yaml+6
@@ -1,5 +1,11 @@
1releases:
1releases:
2
2
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+
3 - version: "0.0.7.3"
9 - version: "0.0.7.3"
4 changes:
10 changes:
5 - description: Support for servant-0.14
11 - 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 @@
1name: servant-quickcheck
1name: servant-quickcheck
2−version: 0.0.7.4
2+version: 0.0.8
3synopsis: QuickCheck entire APIs
3synopsis: QuickCheck entire APIs
4description:
4description:
5 This packages provides QuickCheck properties that are tested across an entire
5 This packages provides QuickCheck properties that are tested across an entire
@@ -13,7 +13,7 @@ category: Web
13build-type: Simple
13build-type: Simple
14cabal-version: >=1.10
14cabal-version: >=1.10
15extra-source-files: CHANGELOG.yaml
15extra-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
17
17
18source-repository head
18source-repository head
19 type: git
19 type: git
@@ -35,11 +35,11 @@ library
35
35
36 build-depends:
36 build-depends:
37 aeson >=0.8 && <2
37 aeson >=0.8 && <2
38− , base >=4.9 && <4.13
38+ , base >=4.9 && <4.14
39− , base-compat-batteries >=0.10.1 && <0.11
39+ , base-compat-batteries >=0.10.1 && <0.12
40 , bytestring >=0.10 && <0.11
40 , bytestring >=0.10 && <0.11
41 , case-insensitive >=1.2 && <1.3
41 , case-insensitive >=1.2 && <1.3
42− , clock >=0.7 && <0.8
42+ , clock >=0.7 && <0.9
43 , data-default-class >=0.0 && <0.2
43 , data-default-class >=0.0 && <0.2
44 , hspec >=2.5.6 && <2.8
44 , hspec >=2.5.6 && <2.8
45 , http-client >=0.4.30 && <0.7
45 , http-client >=0.4.30 && <0.7
@@ -56,11 +56,11 @@ library
56 , string-conversions >=0.3 && <0.5
56 , string-conversions >=0.3 && <0.5
57 , temporary >=1.2 && <1.4
57 , temporary >=1.2 && <1.4
58 , text >=1 && <2
58 , text >=1 && <2
59− , time >=1.5 && <1.9
59+ , time >=1.5 && <1.10
60− , warp >=3.2.4 && <3.3
60+ , warp >=3.2.4 && <3.4
61
61
62 if !impl(ghc >=8.0)
62 if !impl(ghc >=8.0)
63− build-depends: semigroups >=0.18.3 && <0.19
63+ build-depends: semigroups >=0.18.3 && <0.20
64
64
65 hs-source-dirs: src
65 hs-source-dirs: src
66 default-extensions:
66 default-extensions: