git.iko.soy/typeable/postgresql-simple
on master help sign in
Allow ghc-8.8 boot libs
commit1bca77becb6edb9318391bccf9a191b6fcda2343 authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 11 Sep 2019, 00:17 (7 years ago) parent4515c9d
3 files changed+35−60
.ghci−16 .travis.yml+31−40 postgresql-simple.cabal+4−4
.ghcideleted−16
@@ -1,16 +0,0 @@
1−:set -isrc -itest -optP-includedist/build/autogen/cabal_macros.h
2−:set -Wall -fno-warn-name-shadowing
3−
4−:set -XDoAndIfThenElse
5−:set -XOverloadedStrings
6−:set -XBangPatterns
7−:set -XViewPatterns
8−:set -XTypeOperators
9−
10−-- for tests
11−:set -XNamedFieldPuns
12−:set -XRank2Types
13−:set -XRecordWildCards
14−:set -XPatternGuards
15−:set -XScopedTypeVariables
16−:set -fno-warn-unused-do-bind
.travis.yml+31−40
@@ -4,7 +4,7 @@
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
7−# version: 0.3.20190425
7+# version: 0.5.20190908
88#
99language: c
1010dist: xenial
@@ -35,32 +35,31 @@ matrix:
3535 include:
3636 - compiler: ghc-8.8.1
3737 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
38− env: GHCHEAD=true
3938 - compiler: ghc-8.6.5
40− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
39+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
4140 - compiler: ghc-8.4.4
42− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
41+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
4342 - compiler: ghc-8.2.2
44− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
43+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
4544 - compiler: ghc-8.0.2
46− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
45+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
4746 - compiler: ghc-7.10.3
48− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}}
47+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-3.0"]}}
4948 - compiler: ghc-7.8.4
50− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}}
49+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-3.0"]}}
5150 - compiler: ghc-7.6.3
52− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.6.3","cabal-install-2.4"]}}
53− allow_failures:
54− - compiler: ghc-8.8.1
51+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.6.3","cabal-install-3.0"]}}
5552before_install:
5653 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
54+ - WITHCOMPILER="-w $HC"
55+ - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
5756 - HCPKG="$HC-pkg"
5857 - unset CC
5958 - CABAL=/opt/ghc/bin/cabal
6059 - CABALHOME=$HOME/.cabal
6160 - export PATH="$CABALHOME/bin:$PATH"
6261 - TOP=$(pwd)
63− - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
62+ - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
6463 - echo $HCNUMVER
6564 - CABAL="$CABAL -vnormal+nowrap+markoutput"
6665 - set -o pipefail
@@ -87,11 +86,12 @@ install:
8786 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
8887 - TEST=--enable-tests
8988 - BENCH=--enable-benchmarks
90− - GHCHEAD=${GHCHEAD-false}
89+ - HEADHACKAGE=false
9190 - rm -f $CABALHOME/config
9291 - |
9392 echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
9493 echo "remote-build-reporting: anonymous" >> $CABALHOME/config
94+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
9595 echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
9696 echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
9797 echo "world-file: $CABALHOME/world" >> $CABALHOME/config
@@ -105,17 +105,8 @@ install:
105105 echo "repository hackage.haskell.org" >> $CABALHOME/config
106106 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
107107 - |
108− if $GHCHEAD; then
109− echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config
110−
111− echo "repository head.hackage" >> $CABALHOME/config
112− echo " url: http://head.hackage.haskell.org/" >> $CABALHOME/config
113− echo " secure: True" >> $CABALHOME/config
114− echo " root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740" >> $CABALHOME/config
115− echo " 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb" >> $CABALHOME/config
116− echo " 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e" >> $CABALHOME/config
117− echo " key-threshold: 3" >> $CABALHOME/config
118− fi
108+ echo "program-default-options" >> $CABALHOME/config
109+ echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
119110 - cat $CABALHOME/config
120111 - rm -fv cabal.project cabal.project.local cabal.project.freeze
121112 - travis_retry ${CABAL} v2-update -v
@@ -123,18 +114,17 @@ install:
123114 - rm -rf cabal.project cabal.project.local cabal.project.freeze
124115 - touch cabal.project
125116 - |
126− echo 'packages: "."' >> cabal.project
117+ echo "packages: ." >> cabal.project
127118 - |
128− echo "write-ghc-environment-files: always" >> cabal.project
129− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(postgresql-simple)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
119+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(postgresql-simple)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
130120 - cat cabal.project || true
131121 - cat cabal.project.local || true
132122 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
133− - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
123+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
134124 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
135125 - rm cabal.project.freeze
136− - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
137− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
126+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
127+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
138128script:
139129 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
140130 # Packaging...
@@ -142,32 +132,33 @@ script:
142132 # Unpacking...
143133 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
144134 - cd ${DISTDIR} || false
145− - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
135+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
136+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
137+ - PKGDIR_postgresql_simple="$(find . -maxdepth 1 -type d -regex '.*/postgresql-simple-[0-9.]*')"
146138 # Generate cabal.project
147139 - rm -rf cabal.project cabal.project.local cabal.project.freeze
148140 - touch cabal.project
149141 - |
150− echo 'packages: "postgresql-simple-*/*.cabal"' >> cabal.project
142+ echo "packages: ${PKGDIR_postgresql_simple}" >> cabal.project
151143 - |
152− echo "write-ghc-environment-files: always" >> cabal.project
153− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(postgresql-simple)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
144+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(postgresql-simple)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
154145 - cat cabal.project || true
155146 - cat cabal.project.local || true
156147 # Building...
157148 # this builds all libraries and executables (without tests/benchmarks)
158− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
149+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
159150 # Building with tests and benchmarks...
160151 # build & run tests, build benchmarks
161− - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
152+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
162153 # Testing...
163− - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
154+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
164155 # cabal check...
165− - (cd postgresql-simple-* && ${CABAL} -vnormal check)
156+ - (cd ${PKGDIR_postgresql_simple} && ${CABAL} -vnormal check)
166157 # haddock...
167− - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
158+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
168159 # Building without installed constraints for packages in global-db...
169160 - rm -f cabal.project.local
170− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
161+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
171162
172163# REGENDATA ["--config","cabal.haskell-ci","--output",".travis.yml","postgresql-simple.cabal"]
173164# EOF
postgresql-simple.cabal+4−4
@@ -1,7 +1,7 @@
11Cabal-version: 1.12
22Name: postgresql-simple
33Version: 0.6.2
4−x-revision: 1
4+x-revision: 2
55
66Synopsis: Mid-Level PostgreSQL client library
77Description:
@@ -76,12 +76,12 @@ Library
7676
7777 -- GHC bundled libs
7878 Build-depends:
79− base >=4.6.0.0 && <4.13
79+ base >=4.6.0.0 && <4.14
8080 , bytestring >=0.10.0.0 && <0.11
8181 , containers >=0.5.0.0 && <0.7
82− , time >=1.4.0.1 && <1.9
82+ , time >=1.4.0.1 && <1.10
8383 , transformers >=0.3.0.0 && <0.6
84− , template-haskell >=2.8.0.0 && <2.15
84+ , template-haskell >=2.8.0.0 && <2.16
8585 , text >=1.2.3.0 && <1.3
8686
8787 -- Other dependencies