Skip to content

Commit 6adda6d

Browse files
fisxfisx
authored
Merge pull request #37 from maksbotan/maksbotan/haskell-ci
haskell-ci regenerate
2 parents 4b15358 + 40392ed commit 6adda6d

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

‎.travis.yml

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@
22
#
33
# haskell-ci '--output' '.travis.yml' '--config=cabal.haskell-ci' 'servant-multipart.cabal'
44
#
5+
# To regenerate the script (for example after adjusting tested-with) run
6+
#
7+
# haskell-ci regenerate
8+
#
59
# For more information, see https://github.com/haskell-CI/haskell-ci
610
#
7-
# version: 0.5.20190908
11+
# version: 0.10.1
812
#
13+
version: ~> 1.0
914
language: c
15+
os: linux
1016
dist: xenial
1117
git:
1218
# whether to recursively clone submodules
@@ -18,6 +24,7 @@ cache:
1824
directories:
1925
- $HOME/.cabal/packages
2026
- $HOME/.cabal/store
27+
- $HOME/.hlint
2128
before_cache:
2229
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2330
# remove files that are regenerated by 'cabal update'
@@ -27,18 +34,23 @@ before_cache:
2734
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
2835
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
2936
- rm -rfv $CABALHOME/packages/head.hackage
30-
matrix:
37+
jobs:
3138
include:
32-
- compiler: ghc-8.8.1
33-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
39+
- compiler: ghc-8.8.3
40+
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.2"]}}
41+
os: linux
3442
- compiler: ghc-8.6.5
35-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
43+
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.2"]}}
44+
os: linux
3645
- compiler: ghc-8.4.4
37-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
46+
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.2"]}}
47+
os: linux
3848
- compiler: ghc-8.2.2
39-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
49+
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.2"]}}
50+
os: linux
4051
- compiler: ghc-8.0.2
41-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
52+
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.2"]}}
53+
os: linux
4254
before_install:
4355
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
4456
- WITHCOMPILER="-w $HC"
@@ -51,29 +63,8 @@ before_install:
5163
- TOP=$(pwd)
5264
- "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
5365
- echo $HCNUMVER
54-
- CABAL="$CABAL -vnormal+nowrap+markoutput"
66+
- CABAL="$CABAL -vnormal+nowrap"
5567
- set -o pipefail
56-
- |
57-
echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
58-
echo 'BEGIN { state = "output"; }' >> .colorful.awk
59-
echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
60-
echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
61-
echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
62-
echo ' if (state == "cabal") {' >> .colorful.awk
63-
echo ' print blue($0)' >> .colorful.awk
64-
echo ' } else {' >> .colorful.awk
65-
echo ' print $0' >> .colorful.awk
66-
echo ' }' >> .colorful.awk
67-
echo '}' >> .colorful.awk
68-
- cat .colorful.awk
69-
- |
70-
color_cabal_output () {
71-
awk -f $TOP/.colorful.awk
72-
}
73-
- echo text | color_cabal_output
74-
install:
75-
- ${CABAL} --version
76-
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
7768
- TEST=--enable-tests
7869
- BENCH=--enable-benchmarks
7970
- HEADHACKAGE=false
@@ -94,6 +85,9 @@ install:
9485
echo " prefix: $CABALHOME" >> $CABALHOME/config
9586
echo "repository hackage.haskell.org" >> $CABALHOME/config
9687
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
88+
install:
89+
- ${CABAL} --version
90+
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
9791
- |
9892
echo "program-default-options" >> $CABALHOME/config
9993
echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
@@ -105,20 +99,22 @@ install:
10599
- touch cabal.project
106100
- |
107101
echo "packages: ." >> cabal.project
102+
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-multipart' >> cabal.project ; fi
103+
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
108104
- |
109105
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-multipart)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
110106
- cat cabal.project || true
111107
- cat cabal.project.local || true
112108
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
113-
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
109+
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
114110
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
115111
- rm cabal.project.freeze
116-
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
117-
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
112+
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
113+
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
118114
script:
119115
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
120116
# Packaging...
121-
- ${CABAL} v2-sdist all | color_cabal_output
117+
- ${CABAL} v2-sdist all
122118
# Unpacking...
123119
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
124120
- cd ${DISTDIR} || false
@@ -130,33 +126,37 @@ script:
130126
- touch cabal.project
131127
- |
132128
echo "packages: ${PKGDIR_servant_multipart}" >> cabal.project
129+
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-multipart' >> cabal.project ; fi
130+
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
133131
- |
134132
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-multipart)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
135133
- cat cabal.project || true
136134
- cat cabal.project.local || true
137135
# Building...
138136
# this builds all libraries and executables (without tests/benchmarks)
139-
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
137+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
140138
# Building with tests and benchmarks...
141139
# build & run tests, build benchmarks
142-
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
140+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
143141
# Testing...
144-
- ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
142+
- ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
145143
# cabal check...
146144
- (cd ${PKGDIR_servant_multipart} && ${CABAL} -vnormal check)
147145
# haddock...
148-
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
146+
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
149147
# Building without installed constraints for packages in global-db...
150148
- rm -f cabal.project.local
151-
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
149+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
152150
# Constraint sets
153151
- rm -rf cabal.project.local
154152
# Constraint set network-2.8
155-
- if [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='network == 2.8.*' all | color_cabal_output ; fi
153+
- if [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='network == 2.8.*' all ; fi
156154
# Constraint set network-3.0
157-
- if [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='network == 3.0.*' all | color_cabal_output ; fi
155+
- if [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='network == 3.0.*' all ; fi
158156
# Constraint set servant-0.16
159-
- if [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all | color_cabal_output ; fi
157+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all
158+
# Constraint set servant-0.17
159+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all
160160

161-
# REGENDATA ["--output",".travis.yml","--config=cabal.haskell-ci","servant-multipart.cabal"]
161+
# REGENDATA ("0.10.1",["--output",".travis.yml","--config=cabal.haskell-ci","servant-multipart.cabal"])
162162
# EOF

‎servant-multipart.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ category: Web, Servant
1717
build-type: Simple
1818
cabal-version: >=1.10
1919
extra-source-files: CHANGELOG.md
20-
tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.1
20+
tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.3
2121

2222
library
2323
default-language: Haskell2010

0 commit comments

Comments
 (0)