Skip to content

Commit 734313d

Browse files
phadejphadej
committed
Allow base-4.13
1 parent 485341c commit 734313d

File tree

2 files changed

+129
-99
lines changed

2 files changed

+129
-99
lines changed

‎.travis.yml

Lines changed: 125 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@
44
#
55
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
7-
# version: 0.3
7+
# version: 0.5.20190908
88
#
99
language: c
1010
dist: xenial
11-
1211
git:
13-
submodules: false # whether to recursively clone submodules
14-
12+
# whether to recursively clone submodules
13+
submodules: false
1514
cache:
1615
directories:
1716
- $HOME/.cabal/packages
1817
- $HOME/.cabal/store
19-
2018
before_cache:
2119
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2220
# remove files that are regenerated by 'cabal update'
@@ -25,126 +23,157 @@ before_cache:
2523
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
2624
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
2725
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
28-
2926
- rm -rfv $CABALHOME/packages/head.hackage
30-
3127
matrix:
3228
include:
33-
- compiler: "ghc-8.6.4"
34-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.4], sources: [hvr-ghc]}}
35-
- compiler: "ghc-8.4.4"
36-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
37-
- compiler: "ghc-8.2.2"
38-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
39-
- compiler: "ghc-8.0.2"
40-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
41-
- compiler: "ghc-7.10.3"
42-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
43-
- compiler: "ghc-7.8.4"
44-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}}
45-
- compiler: "ghc-7.6.3"
46-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.6.3], sources: [hvr-ghc]}}
47-
- compiler: "ghc-7.4.2"
48-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.4.2], sources: [hvr-ghc]}}
49-
- compiler: "ghc-7.2.2"
50-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.2.2], sources: [hvr-ghc]}}
51-
- compiler: "ghc-7.0.4"
52-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.0.4], sources: [hvr-ghc]}}
53-
- compiler: "ghc-head"
54-
env: GHCHEAD=true
55-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}}
56-
29+
- compiler: ghc-8.8.1
30+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
31+
- compiler: ghc-8.6.5
32+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
33+
- compiler: ghc-8.4.4
34+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
35+
- compiler: ghc-8.2.2
36+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
37+
- compiler: ghc-8.0.2
38+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
39+
- compiler: ghc-7.10.3
40+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-3.0"]}}
41+
- compiler: ghc-7.8.4
42+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-3.0"]}}
43+
- compiler: ghc-7.6.3
44+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.6.3","cabal-install-3.0"]}}
45+
- compiler: ghc-7.4.2
46+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.4.2","cabal-install-3.0"]}}
47+
- compiler: ghc-7.2.2
48+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.2.2","cabal-install-3.0"]}}
49+
- compiler: ghc-7.0.4
50+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.0.4","cabal-install-3.0"]}}
51+
- compiler: ghc-head
52+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-head","cabal-install-head"]}}
5753
allow_failures:
58-
- compiler: "ghc-head"
59-
54+
- compiler: ghc-head
6055
before_install:
61-
- HC=/opt/ghc/bin/${CC}
62-
- HCPKG=${HC/ghc/ghc-pkg}
56+
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
57+
- WITHCOMPILER="-w $HC"
58+
- HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
59+
- HCPKG="$HC-pkg"
6360
- unset CC
6461
- CABAL=/opt/ghc/bin/cabal
6562
- CABALHOME=$HOME/.cabal
6663
- export PATH="$CABALHOME/bin:$PATH"
67-
- ROOTDIR=$(pwd)
68-
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
64+
- TOP=$(pwd)
65+
- "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
6966
- echo $HCNUMVER
70-
67+
- CABAL="$CABAL -vnormal+nowrap+markoutput"
68+
- set -o pipefail
69+
- |
70+
echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
71+
echo 'BEGIN { state = "output"; }' >> .colorful.awk
72+
echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
73+
echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
74+
echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
75+
echo ' if (state == "cabal") {' >> .colorful.awk
76+
echo ' print blue($0)' >> .colorful.awk
77+
echo ' } else {' >> .colorful.awk
78+
echo ' print $0' >> .colorful.awk
79+
echo ' }' >> .colorful.awk
80+
echo '}' >> .colorful.awk
81+
- cat .colorful.awk
82+
- |
83+
color_cabal_output () {
84+
awk -f $TOP/.colorful.awk
85+
}
86+
- echo text | color_cabal_output
7187
install:
7288
- ${CABAL} --version
7389
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
7490
- TEST=--enable-tests
7591
- BENCH=--enable-benchmarks
76-
- GHCHEAD=${GHCHEAD-false}
77-
- travis_retry ${CABAL} update -v
78-
- sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config
79-
- rm -fv cabal.project cabal.project.local
80-
# Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
92+
- HEADHACKAGE=false
93+
- if [ $HCNUMVER -gt 80801 ] ; then HEADHACKAGE=true ; fi
94+
- rm -f $CABALHOME/config
8195
- |
82-
if $GHCHEAD; then
83-
sed -i 's/-- allow-newer: .*/allow-newer: *:base/' $CABALHOME/config
84-
for pkg in $($HCPKG list --simple-output); do pkg=$(echo $pkg | sed 's/-[^-]*$//'); sed -i "s/allow-newer: /allow-newer: *:$pkg, /" $CABALHOME/config; done
85-
86-
echo 'repository head.hackage' >> $CABALHOME/config
87-
echo ' url: http://head.hackage.haskell.org/' >> $CABALHOME/config
88-
echo ' secure: True' >> $CABALHOME/config
89-
echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> $CABALHOME/config
90-
echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> $CABALHOME/config
91-
echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> $CABALHOME/config
92-
echo ' key-threshold: 3' >> $CABALHOME.config
93-
94-
grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$'
95-
96-
${CABAL} new-update head.hackage -v
96+
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
97+
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
98+
echo "write-ghc-environment-files: always" >> $CABALHOME/config
99+
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
100+
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
101+
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
102+
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
103+
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
104+
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
105+
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
106+
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
107+
echo "install-dirs user" >> $CABALHOME/config
108+
echo " prefix: $CABALHOME" >> $CABALHOME/config
109+
echo "repository hackage.haskell.org" >> $CABALHOME/config
110+
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
111+
- |
112+
if $HEADHACKAGE; then
113+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config
114+
echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config
115+
echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config
116+
echo " secure: True" >> $CABALHOME/config
117+
echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config
118+
echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config
119+
echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
120+
echo " key-threshold: 3" >> $CABALHOME/config
97121
fi
98-
- grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$'
99-
- rm -f cabal.project
122+
- |
123+
echo "program-default-options" >> $CABALHOME/config
124+
echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
125+
- cat $CABALHOME/config
126+
- rm -fv cabal.project cabal.project.local cabal.project.freeze
127+
- travis_retry ${CABAL} v2-update -v
128+
# Generate cabal.project
129+
- rm -rf cabal.project cabal.project.local cabal.project.freeze
100130
- touch cabal.project
101-
- "printf 'packages: \".\"\\n' >> cabal.project"
102-
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
103-
- touch cabal.project.local
104-
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(postgresql-libpq)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
131+
- |
132+
echo "packages: ." >> cabal.project
133+
- |
134+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(postgresql-libpq)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
105135
- cat cabal.project || true
106136
- cat cabal.project.local || true
107137
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
108-
- rm -f cabal.project.freeze
109-
- ${CABAL} new-freeze -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dry
110-
- "cat \"cabal.project.freeze\" | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
111-
- rm "cabal.project.freeze"
112-
- ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
113-
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
114-
- rm -rf .ghc.environment.* "."/dist
115-
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
116-
117-
# Here starts the actual work to be performed for the package under test;
118-
# any command which exits with a non-zero exit code causes the build to fail.
138+
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
139+
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
140+
- rm cabal.project.freeze
141+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
142+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
119143
script:
120-
# test that source-distributions can be generated
121-
- ${CABAL} new-sdist all
144+
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
145+
# Packaging...
146+
- ${CABAL} v2-sdist all | color_cabal_output
147+
# Unpacking...
122148
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
123149
- cd ${DISTDIR} || false
124-
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
125-
- rm -f cabal.project
150+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
151+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
152+
- PKGDIR_postgresql_libpq="$(find . -maxdepth 1 -type d -regex '.*/postgresql-libpq-[0-9.]*')"
153+
# Generate cabal.project
154+
- rm -rf cabal.project cabal.project.local cabal.project.freeze
126155
- touch cabal.project
127-
- "printf 'packages: \"postgresql-libpq-*/*.cabal\"\\n' >> cabal.project"
128-
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
129-
- touch cabal.project.local
130-
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(postgresql-libpq)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
156+
- |
157+
echo "packages: ${PKGDIR_postgresql_libpq}" >> cabal.project
158+
- |
159+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(postgresql-libpq)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
131160
- cat cabal.project || true
132161
- cat cabal.project.local || true
162+
# Building...
133163
# this builds all libraries and executables (without tests/benchmarks)
134-
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all
135-
164+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
165+
# Building with tests and benchmarks...
136166
# build & run tests, build benchmarks
137-
- ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all
138-
- ${CABAL} new-test -w ${HC} ${TEST} ${BENCH} all
139-
140-
# cabal check
141-
- (cd postgresql-libpq-* && ${CABAL} check)
142-
143-
# haddock
144-
- ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all
145-
146-
# Build without installed constraints for packages in global-db
147-
- rm -f cabal.project.local; ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all;
167+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
168+
# Testing...
169+
- ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
170+
# cabal check...
171+
- (cd ${PKGDIR_postgresql_libpq} && ${CABAL} -vnormal check)
172+
# haddock...
173+
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
174+
# Building without installed constraints for packages in global-db...
175+
- rm -f cabal.project.local
176+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
148177

149178
# REGENDATA ["--output",".travis.yml","--ghc-head","postgresql-libpq.cabal"]
150179
# EOF

‎postgresql-libpq.cabal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@ Tested-with:
3030
GHC==8.0.2,
3131
GHC==8.2.2,
3232
GHC==8.4.4,
33-
GHC==8.6.4
33+
GHC==8.6.5,
34+
GHC==8.8.1
3435

3536
extra-source-files:
3637
CHANGELOG.md
3738

3839
Custom-setup
3940
setup-depends:
40-
base >= 4.3 && <5, Cabal >= 1.10 && <2.5
41+
base >= 4.3 && <5, Cabal >= 1.10 && <3.1
4142

4243
-- If true, use pkg-config, otherwise use the pg_config based build
4344
-- configuration
@@ -51,7 +52,7 @@ Library
5152
include-dirs: cbits
5253
Exposed-modules: Database.PostgreSQL.LibPQ
5354
Database.PostgreSQL.LibPQ.Internal
54-
Build-depends: base >=4.3 && <4.13
55+
Build-depends: base >=4.3 && <4.14
5556
, bytestring >=0.9.1.0 && <0.11
5657

5758
if !os(windows)

0 commit comments

Comments
 (0)