git.iko.soy/typeable/http-api-data
on master help sign in
Allow base-4.14
5a65425Oleg Grenrus
.travis.yml+58−68
compare with master
unifiedsplit
@@ -4,9 +4,11 @@
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.7.20191106
7+# version: 0.9.20200326
8#
8#
9+version: ~> 1.0
9language: c
10language: c
11+os: linux
10dist: xenial
12dist: xenial
11git:
13git:
12 # whether to recursively clone submodules
14 # whether to recursively clone submodules
@@ -28,22 +30,32 @@ before_cache:
28 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
30 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
29 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
31 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
30 - rm -rfv $CABALHOME/packages/head.hackage
32 - rm -rfv $CABALHOME/packages/head.hackage
31−matrix:
33+jobs:
32 include:
34 include:
33− - compiler: ghc-8.8.1
35+ - compiler: ghc-8.10.1
36+ 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"]}}
37+ os: linux
38+ - compiler: ghc-8.8.3
34− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
39+ 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"]}}
40+ os: linux
35 - compiler: ghc-8.6.5
41 - compiler: ghc-8.6.5
36− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
42+ 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"]}}
43+ os: linux
37 - compiler: ghc-8.4.4
44 - compiler: ghc-8.4.4
38− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
45+ 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.4.4","cabal-install-3.0"]}}
46+ os: linux
39 - compiler: ghc-8.2.2
47 - compiler: ghc-8.2.2
40− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
48+ 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.2.2","cabal-install-3.0"]}}
49+ os: linux
41 - compiler: ghc-8.0.2
50 - compiler: ghc-8.0.2
42− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
51+ 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.0.2","cabal-install-3.0"]}}
52+ os: linux
43 - compiler: ghc-7.10.3
53 - compiler: ghc-7.10.3
44− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-3.0"]}}
54+ 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-7.10.3","cabal-install-3.0"]}}
55+ os: linux
45 - compiler: ghc-7.8.4
56 - compiler: ghc-7.8.4
46− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-3.0"]}}
57+ 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-7.8.4","cabal-install-3.0"]}}
58+ os: linux
47before_install:
59before_install:
48 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
60 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
49 - WITHCOMPILER="-w $HC"
61 - WITHCOMPILER="-w $HC"
@@ -56,83 +68,59 @@ before_install:
56 - TOP=$(pwd)
68 - TOP=$(pwd)
57 - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
69 - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
58 - echo $HCNUMVER
70 - echo $HCNUMVER
59− - CABAL="$CABAL -vnormal+nowrap+markoutput"
71+ - CABAL="$CABAL -vnormal+nowrap"
60 - set -o pipefail
72 - set -o pipefail
61− - |
62− echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
63− echo 'BEGIN { state = "output"; }' >> .colorful.awk
64− echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
65− echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
66− echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
67− echo ' if (state == "cabal") {' >> .colorful.awk
68− echo ' print blue($0)' >> .colorful.awk
69− echo ' } else {' >> .colorful.awk
70− echo ' print $0' >> .colorful.awk
71− echo ' }' >> .colorful.awk
72− echo '}' >> .colorful.awk
73− - cat .colorful.awk
74− - |
75− color_cabal_output () {
76− awk -f $TOP/.colorful.awk
77− }
78− - echo text | color_cabal_output
79−install:
80− - ${CABAL} --version
81− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
82 - TEST=--enable-tests
73 - TEST=--enable-tests
83 - BENCH=--enable-benchmarks
74 - BENCH=--enable-benchmarks
84 - HEADHACKAGE=false
75 - HEADHACKAGE=false
85 - rm -f $CABALHOME/config
76 - rm -f $CABALHOME/config
86 - |
77 - |
87− echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
78+ echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
88− echo "remote-build-reporting: anonymous" >> $CABALHOME/config
79+ echo "remote-build-reporting: anonymous" >> $CABALHOME/config
89− echo "write-ghc-environment-files: always" >> $CABALHOME/config
80+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
90− echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
81+ echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
91− echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
82+ echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
92− echo "world-file: $CABALHOME/world" >> $CABALHOME/config
83+ echo "world-file: $CABALHOME/world" >> $CABALHOME/config
93− echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
84+ echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
94− echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
85+ echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
95− echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
86+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
96− echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
87+ echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
97− echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
88+ echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
98− echo "install-dirs user" >> $CABALHOME/config
89+ echo "install-dirs user" >> $CABALHOME/config
99− echo " prefix: $CABALHOME" >> $CABALHOME/config
90+ echo " prefix: $CABALHOME" >> $CABALHOME/config
100− echo "repository hackage.haskell.org" >> $CABALHOME/config
91+ echo "repository hackage.haskell.org" >> $CABALHOME/config
101− echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
92+ echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
102− echo " secure: True" >> $CABALHOME/config
93+install:
103− echo " key-threshold: 3" >> $CABALHOME/config
94+ - ${CABAL} --version
104− echo " root-keys:" >> $CABALHOME/config
95+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
105− echo " fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >> $CABALHOME/config
106− echo " 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >> $CABALHOME/config
107− echo " 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >> $CABALHOME/config
108− echo " 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >> $CABALHOME/config
109− echo " 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >> $CABALHOME/config
110 - |
96 - |
111 echo "program-default-options" >> $CABALHOME/config
97 echo "program-default-options" >> $CABALHOME/config
112 echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
98 echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
113 - cat $CABALHOME/config
99 - cat $CABALHOME/config
114 - rm -fv cabal.project cabal.project.local cabal.project.freeze
100 - rm -fv cabal.project cabal.project.local cabal.project.freeze
115 - travis_retry ${CABAL} v2-update -v
101 - travis_retry ${CABAL} v2-update -v
116− - if [ $HCNUMVER -ge 80000 ] ; then (cd /tmp && ${CABAL} v2-install $WITHCOMPILER -j2 doctest --constraint='doctest ==0.16.*' | color_cabal_output) ; fi
102+ - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 81000 ] ; then (cd /tmp && ${CABAL} v2-install $WITHCOMPILER -j2 doctest --constraint='doctest ==0.16.2.*') ; fi
117 # Generate cabal.project
103 # Generate cabal.project
118 - rm -rf cabal.project cabal.project.local cabal.project.freeze
104 - rm -rf cabal.project cabal.project.local cabal.project.freeze
119 - touch cabal.project
105 - touch cabal.project
120 - |
106 - |
121 echo "packages: ." >> cabal.project
107 echo "packages: ." >> cabal.project
108+ - if [ $HCNUMVER -ge 80000 ] ; then echo 'package http-api-data' >> cabal.project ; fi
109+ - "if [ $HCNUMVER -ge 80000 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
122 - |
110 - |
123 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(http-api-data)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
111 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(http-api-data)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
124 - cat cabal.project || true
112 - cat cabal.project || true
125 - cat cabal.project.local || true
113 - cat cabal.project.local || true
126 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
114 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
127− - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
115+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
128 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
116 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
129 - rm cabal.project.freeze
117 - rm cabal.project.freeze
130− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
118+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
131− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
119+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
132script:
120script:
133 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
121 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
134 # Packaging...
122 # Packaging...
135− - ${CABAL} v2-sdist all | color_cabal_output
123+ - ${CABAL} v2-sdist all
136 # Unpacking...
124 # Unpacking...
137 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
125 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
138 - cd ${DISTDIR} || false
126 - cd ${DISTDIR} || false
@@ -144,31 +132,33 @@ script:
144 - touch cabal.project
132 - touch cabal.project
145 - |
133 - |
146 echo "packages: ${PKGDIR_http_api_data}" >> cabal.project
134 echo "packages: ${PKGDIR_http_api_data}" >> cabal.project
135+ - if [ $HCNUMVER -ge 80000 ] ; then echo 'package http-api-data' >> cabal.project ; fi
136+ - "if [ $HCNUMVER -ge 80000 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
147 - |
137 - |
148 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(http-api-data)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
138 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(http-api-data)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
149 - cat cabal.project || true
139 - cat cabal.project || true
150 - cat cabal.project.local || true
140 - cat cabal.project.local || true
151 # Building...
141 # Building...
152 # this builds all libraries and executables (without tests/benchmarks)
142 # this builds all libraries and executables (without tests/benchmarks)
153− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
143+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
154 # Building with tests and benchmarks...
144 # Building with tests and benchmarks...
155 # build & run tests, build benchmarks
145 # build & run tests, build benchmarks
156− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
146+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
157 # Testing...
147 # Testing...
158− - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
148+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
159 # Doctest...
149 # Doctest...
160− - if [ $HCNUMVER -ge 80000 ] ; then (cd ${PKGDIR_http_api_data} && doctest src/) ; fi
150+ - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 81000 ] ; then (cd ${PKGDIR_http_api_data} && doctest src/) ; fi
161 # cabal check...
151 # cabal check...
162 - (cd ${PKGDIR_http_api_data} && ${CABAL} -vnormal check)
152 - (cd ${PKGDIR_http_api_data} && ${CABAL} -vnormal check)
163 # haddock...
153 # haddock...
164− - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
154+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
165 # Building without installed constraints for packages in global-db...
155 # Building without installed constraints for packages in global-db...
166 - rm -f cabal.project.local
156 - rm -f cabal.project.local
167− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
157+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
168 # Constraint sets
158 # Constraint sets
169 - rm -rf cabal.project.local
159 - rm -rf cabal.project.local
170 # Constraint set text-show
160 # Constraint set text-show
171− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all | color_cabal_output
161+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all
172
162
173−# REGENDATA ("0.7.20191106",["--config=cabal.haskell-ci","http-api-data.cabal"])
163+# REGENDATA ("0.9.20200326",["--config=cabal.haskell-ci","http-api-data.cabal"])
174# EOF
164# EOF
cabal.haskell-ci+1−1
@@ -1,5 +1,5 @@
1branches: master
1branches: master
2−doctest: True
2+doctest: <8.10
3
3
4constraint-set text-show
4constraint-set text-show
5 constraints: http-api-data +use-text-show
5 constraints: http-api-data +use-text-show
http-api-data.cabal+4−2
@@ -1,6 +1,7 @@
1cabal-version: >= 1.10
1cabal-version: >= 1.10
2name: http-api-data
2name: http-api-data
3version: 0.4.1.1
3version: 0.4.1.1
4+x-revision: 1
4
5
5synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.
6synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.
6category: Web
7category: Web
@@ -30,7 +31,8 @@ tested-with:
30 GHC==8.2.2,
31 GHC==8.2.2,
31 GHC==8.4.4,
32 GHC==8.4.4,
32 GHC==8.6.5,
33 GHC==8.6.5,
33− GHC==8.8.1
34+ GHC==8.8.3,
35+ GHC==8.10.1
34
36
35flag use-text-show
37flag use-text-show
36 description: Use text-show library for efficient ToHttpApiData implementations.
38 description: Use text-show library for efficient ToHttpApiData implementations.
@@ -42,7 +44,7 @@ library
42 include-dirs: include/
44 include-dirs: include/
43
45
44 -- GHC bundled
46 -- GHC bundled
45− build-depends: base >= 4.7 && < 4.14
47+ build-depends: base >= 4.7 && < 4.15
46 , bytestring >= 0.10.4.0 && < 0.11
48 , bytestring >= 0.10.4.0 && < 0.11
47 , containers >= 0.5.5.1 && < 0.7
49 , containers >= 0.5.5.1 && < 0.7
48 , text >= 1.2.3.0 && < 1.3
50 , text >= 1.2.3.0 && < 1.3