Skip to content

Commit 2348030

Browse files
phadejhvr
phadej
authored and
hvr
committed
Allow base-4.14
1 parent 5996d4f commit 2348030

File tree

2 files changed

+56
-68
lines changed

2 files changed

+56
-68
lines changed

‎.travis.yml

Lines changed: 54 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
#
55
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
7-
# version: 0.3.20190521
7+
# version: 0.9.20200325
88
#
9+
version: ~> 1.0
910
language: c
11+
os: linux
1012
dist: xenial
1113
git:
1214
# whether to recursively clone submodules
@@ -15,6 +17,7 @@ cache:
1517
directories:
1618
- $HOME/.cabal/packages
1719
- $HOME/.cabal/store
20+
- $HOME/.hlint
1821
before_cache:
1922
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2023
# remove files that are regenerated by 'cabal update'
@@ -24,69 +27,60 @@ before_cache:
2427
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
2528
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
2629
- rm -rfv $CABALHOME/packages/head.hackage
27-
matrix:
30+
jobs:
2831
include:
29-
- compiler: ghc-8.8.1
30-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
31-
env: GHCHEAD=true
32+
- compiler: ghc-8.10.1
33+
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"]}}
34+
os: linux
35+
- compiler: ghc-8.8.3
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.8.3","cabal-install-3.0"]}}
37+
os: linux
3238
- compiler: ghc-8.6.5
33-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
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.6.5","cabal-install-3.0"]}}
40+
os: linux
3441
- compiler: ghc-8.4.4
35-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
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.4.4","cabal-install-3.0"]}}
43+
os: linux
3644
- compiler: ghc-8.2.2
37-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
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.2.2","cabal-install-3.0"]}}
46+
os: linux
3847
- compiler: ghc-8.0.2
39-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
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.0.2","cabal-install-3.0"]}}
49+
os: linux
4050
- compiler: ghc-7.10.3
41-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}}
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-7.10.3","cabal-install-3.0"]}}
52+
os: linux
4253
- compiler: ghc-7.8.4
43-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}}
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.8.4","cabal-install-3.0"]}}
55+
os: linux
4456
- compiler: ghc-7.6.3
45-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.6.3","cabal-install-2.4"]}}
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.6.3","cabal-install-3.0"]}}
58+
os: linux
4659
- compiler: ghc-7.4.2
47-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.4.2","cabal-install-2.4"]}}
48-
allow_failures:
49-
- compiler: ghc-8.8.1
60+
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.4.2","cabal-install-3.0"]}}
61+
os: linux
5062
before_install:
5163
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
64+
- WITHCOMPILER="-w $HC"
65+
- HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
5266
- HCPKG="$HC-pkg"
5367
- unset CC
5468
- CABAL=/opt/ghc/bin/cabal
5569
- CABALHOME=$HOME/.cabal
5670
- export PATH="$CABALHOME/bin:$PATH"
5771
- TOP=$(pwd)
58-
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
72+
- "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
5973
- echo $HCNUMVER
60-
- CABAL="$CABAL -vnormal+nowrap+markoutput"
74+
- CABAL="$CABAL -vnormal+nowrap"
6175
- set -o pipefail
62-
- |
63-
echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
64-
echo 'BEGIN { state = "output"; }' >> .colorful.awk
65-
echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
66-
echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
67-
echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
68-
echo ' if (state == "cabal") {' >> .colorful.awk
69-
echo ' print blue($0)' >> .colorful.awk
70-
echo ' } else {' >> .colorful.awk
71-
echo ' print $0' >> .colorful.awk
72-
echo ' }' >> .colorful.awk
73-
echo '}' >> .colorful.awk
74-
- cat .colorful.awk
75-
- |
76-
color_cabal_output () {
77-
awk -f $TOP/.colorful.awk
78-
}
79-
- echo text | color_cabal_output
80-
install:
81-
- ${CABAL} --version
82-
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
8376
- TEST=--enable-tests
8477
- BENCH=--enable-benchmarks
85-
- GHCHEAD=${GHCHEAD-false}
78+
- HEADHACKAGE=false
8679
- rm -f $CABALHOME/config
8780
- |
8881
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
8982
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
83+
echo "write-ghc-environment-files: always" >> $CABALHOME/config
9084
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
9185
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
9286
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
@@ -99,70 +93,64 @@ install:
9993
echo " prefix: $CABALHOME" >> $CABALHOME/config
10094
echo "repository hackage.haskell.org" >> $CABALHOME/config
10195
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
96+
install:
97+
- ${CABAL} --version
98+
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
10299
- |
103-
if $GHCHEAD; then
104-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config
105-
106-
echo "repository head.hackage" >> $CABALHOME/config
107-
echo " url: http://head.hackage.haskell.org/" >> $CABALHOME/config
108-
echo " secure: True" >> $CABALHOME/config
109-
echo " root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740" >> $CABALHOME/config
110-
echo " 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb" >> $CABALHOME/config
111-
echo " 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e" >> $CABALHOME/config
112-
echo " key-threshold: 3" >> $CABALHOME/config
113-
fi
100+
echo "program-default-options" >> $CABALHOME/config
101+
echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
114102
- cat $CABALHOME/config
115103
- rm -fv cabal.project cabal.project.local cabal.project.freeze
116104
- travis_retry ${CABAL} v2-update -v
117105
# Generate cabal.project
118106
- rm -rf cabal.project cabal.project.local cabal.project.freeze
119107
- touch cabal.project
120108
- |
121-
echo 'packages: "."' >> cabal.project
109+
echo "packages: ." >> cabal.project
122110
- |
123-
echo "write-ghc-environment-files: always" >> cabal.project
124111
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cassava)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
125112
- cat cabal.project || true
126113
- cat cabal.project.local || true
127114
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
128-
- ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
115+
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
129116
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
130117
- rm cabal.project.freeze
131-
- ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
132-
- ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
118+
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
119+
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
133120
script:
134121
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
135122
# Packaging...
136-
- ${CABAL} v2-sdist all | color_cabal_output
123+
- ${CABAL} v2-sdist all
137124
# Unpacking...
138125
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
139126
- cd ${DISTDIR} || false
140-
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
127+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
128+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
129+
- PKGDIR_cassava="$(find . -maxdepth 1 -type d -regex '.*/cassava-[0-9.]*')"
141130
# Generate cabal.project
142131
- rm -rf cabal.project cabal.project.local cabal.project.freeze
143132
- touch cabal.project
144133
- |
145-
echo 'packages: "cassava-*/*.cabal"' >> cabal.project
134+
echo "packages: ${PKGDIR_cassava}" >> cabal.project
146135
- |
147-
echo "write-ghc-environment-files: always" >> cabal.project
148136
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cassava)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
149137
- cat cabal.project || true
150138
- cat cabal.project.local || true
151139
# Building...
152140
# this builds all libraries and executables (without tests/benchmarks)
153-
- ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
141+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
154142
# Building with tests and benchmarks...
155143
# build & run tests, build benchmarks
156-
- ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
144+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
157145
# Testing...
158-
- ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
146+
- ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
159147
# cabal check...
160-
- (cd cassava-* && ${CABAL} -vnormal check)
148+
- (cd ${PKGDIR_cassava} && ${CABAL} -vnormal check)
161149
# haddock...
162-
- ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
150+
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
163151
# Building without installed constraints for packages in global-db...
164152
- rm -f cabal.project.local
165-
- ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
153+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
166154

167-
# REGENDATA ["cassava.cabal"]
155+
# REGENDATA ("0.9.20200325",["cassava.cabal"])
168156
# EOF

‎cassava.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Build-type: Simple
4242
Extra-source-files: examples/*.hs,
4343
CHANGES.md,
4444
README.md
45-
Tested-with: GHC==8.8.1, GHC==8.6.5, GHC==8.4.4, GHC ==8.2.2, GHC ==8.0.2, GHC ==7.10.3, GHC ==7.8.4, GHC ==7.6.3, GHC ==7.4.2
45+
Tested-with: GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC ==8.2.2, GHC ==8.0.2, GHC ==7.10.3, GHC ==7.8.4, GHC ==7.6.3, GHC ==7.4.2
4646

4747
----------------------------------------------------------------------------
4848

@@ -96,7 +96,7 @@ Library
9696
Build-depends:
9797
array >= 0.4 && < 0.6,
9898
attoparsec >= 0.11.3.0 && < 0.14,
99-
base >= 4.5 && < 4.14,
99+
base >= 4.5 && < 4.15,
100100
bytestring >= 0.9.2 && < 0.11,
101101
containers >= 0.4.2 && < 0.7,
102102
deepseq >= 1.1 && < 1.5,

0 commit comments

Comments
 (0)