git.iko.soy/typeable/http-api-data
on master help sign in
base-4.13 / ghc-8.8
commit43eca7282510520150a619d507f3286e13958029 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSat 31 Aug 2019, 21:04 (7 years ago) parentc6963d3
2 files changed+28−40
.travis.yml+27−39 http-api-data.cabal+1−1
.travis.yml+27−39
@@ -4,7 +4,7 @@
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
7−# version: 0.3.20190521
7+# version: 0.5.20180830
88#
99language: c
1010dist: xenial
@@ -31,30 +31,29 @@ matrix:
3131 include:
3232 - compiler: ghc-8.8.1
3333 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
34− env: GHCHEAD=true
3534 - compiler: ghc-8.6.5
36− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
35+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
3736 - compiler: ghc-8.4.4
38− 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"]}}
3938 - compiler: ghc-8.2.2
40− 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"]}}
4140 - compiler: ghc-8.0.2
42− 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"]}}
4342 - compiler: ghc-7.10.3
44− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}}
43+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-3.0"]}}
4544 - compiler: ghc-7.8.4
46− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}}
47− allow_failures:
48− - compiler: ghc-8.8.1
45+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-3.0"]}}
4946before_install:
5047 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
48+ - WITHCOMPILER="-w $HC"
49+ - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
5150 - HCPKG="$HC-pkg"
5251 - unset CC
5352 - CABAL=/opt/ghc/bin/cabal
5453 - CABALHOME=$HOME/.cabal
5554 - export PATH="$CABALHOME/bin:$PATH"
5655 - TOP=$(pwd)
57− - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
56+ - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
5857 - echo $HCNUMVER
5958 - CABAL="$CABAL -vnormal+nowrap+markoutput"
6059 - set -o pipefail
@@ -81,11 +80,12 @@ install:
8180 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
8281 - TEST=--enable-tests
8382 - BENCH=--enable-benchmarks
84− - GHCHEAD=${GHCHEAD-false}
83+ - HEADHACKAGE=false
8584 - rm -f $CABALHOME/config
8685 - |
8786 echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
8887 echo "remote-build-reporting: anonymous" >> $CABALHOME/config
88+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
8989 echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
9090 echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
9191 echo "world-file: $CABALHOME/world" >> $CABALHOME/config
@@ -98,18 +98,6 @@ install:
9898 echo " prefix: $CABALHOME" >> $CABALHOME/config
9999 echo "repository hackage.haskell.org" >> $CABALHOME/config
100100 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
101− - |
102− if $GHCHEAD; then
103− echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config
104−
105− echo "repository head.hackage" >> $CABALHOME/config
106− echo " url: http://head.hackage.haskell.org/" >> $CABALHOME/config
107− echo " secure: True" >> $CABALHOME/config
108− echo " root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740" >> $CABALHOME/config
109− echo " 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb" >> $CABALHOME/config
110− echo " 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e" >> $CABALHOME/config
111− echo " key-threshold: 3" >> $CABALHOME/config
112− fi
113101 - cat $CABALHOME/config
114102 - rm -fv cabal.project cabal.project.local cabal.project.freeze
115103 - travis_retry ${CABAL} v2-update -v
@@ -117,18 +105,17 @@ install:
117105 - rm -rf cabal.project cabal.project.local cabal.project.freeze
118106 - touch cabal.project
119107 - |
120− echo 'packages: "."' >> cabal.project
108+ echo "packages: ." >> cabal.project
121109 - |
122− echo "write-ghc-environment-files: always" >> cabal.project
123110 - "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"
124111 - cat cabal.project || true
125112 - cat cabal.project.local || true
126113 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
127− - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
114+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
128115 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
129116 - rm cabal.project.freeze
130− - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
131− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
117+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
118+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
132119script:
133120 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
134121 # Packaging...
@@ -136,36 +123,37 @@ script:
136123 # Unpacking...
137124 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
138125 - cd ${DISTDIR} || false
139− - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
126+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
127+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
128+ - PKGDIR_http_api_data="$(find . -maxdepth 1 -type d -regex '.*/http-api-data-[0-9.]*')"
140129 # Generate cabal.project
141130 - rm -rf cabal.project cabal.project.local cabal.project.freeze
142131 - touch cabal.project
143132 - |
144− echo 'packages: "http-api-data-*/*.cabal"' >> cabal.project
133+ echo "packages: ${PKGDIR_http_api_data}" >> cabal.project
145134 - |
146− echo "write-ghc-environment-files: always" >> cabal.project
147135 - "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"
148136 - cat cabal.project || true
149137 - cat cabal.project.local || true
150138 # Building...
151139 # this builds all libraries and executables (without tests/benchmarks)
152− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
140+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
153141 # Building with tests and benchmarks...
154142 # build & run tests, build benchmarks
155− - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
143+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
156144 # Testing...
157− - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
145+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
158146 # cabal check...
159− - (cd http-api-data-* && ${CABAL} -vnormal check)
147+ - (cd ${PKGDIR_http_api_data} && ${CABAL} -vnormal check)
160148 # haddock...
161− - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
149+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
162150 # Building without installed constraints for packages in global-db...
163151 - rm -f cabal.project.local
164− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
152+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
165153 # Constraint sets
166154 - rm -rf cabal.project.local
167155 # Constraint set text-show
168− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all | color_cabal_output
156+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all | color_cabal_output
169157
170158# REGENDATA ["--config=cabal.haskell-ci","http-api-data.cabal"]
171159# EOF
http-api-data.cabal+1−1
@@ -48,7 +48,7 @@ library
4848 include-dirs: include/
4949
5050 -- GHC bundled
51− build-depends: base >= 4.7 && < 4.13
51+ build-depends: base >= 4.7 && < 4.14
5252 , bytestring >= 0.10.4.0 && < 0.11
5353 , containers >= 0.5.5.1 && < 0.7
5454 , text >= 1.2.3.0 && < 1.3