Skip to content

Commit 06834a3

Browse files
emilypiemilypi
authored
Upgrade travis.yml to use haskell-ci == 0.10.1 (#256)
* upgrade haskell-ci to 0.10 * add 8.10.1 + some nicer formatting * bump to stable GHC 8.8.3
1 parent 22e0e40 commit 06834a3

File tree

2 files changed

+61
-67
lines changed

2 files changed

+61
-67
lines changed

‎.travis.yml

Lines changed: 51 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
# This Travis job script has been generated by a script via
22
#
3-
# haskell-ci '--benchmarks-jobs=>= 7.10' '--ghc-head' '--installed=-containers' '--installed=-binary' 'unordered-containers.cabal'
3+
# haskell-ci '--benchmarks-jobs= >=7.10' '--ghc-head' '--installed=-containers' '--installed=-binary' 'unordered-containers.cabal'
4+
#
5+
# To regenerate the script (for example after adjusting tested-with) run
6+
#
7+
# haskell-ci regenerate
48
#
59
# For more information, see https://github.com/haskell-CI/haskell-ci
610
#
7-
# version: 0.9.20191209
11+
# version: 0.10.1
812
#
913
version: ~> 1.0
1014
language: c
@@ -29,26 +33,29 @@ before_cache:
2933
- rm -rfv $CABALHOME/packages/head.hackage
3034
jobs:
3135
include:
32-
- compiler: ghc-8.8.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.8.1","cabal-install-3.0"]}}
36+
- compiler: ghc-8.10.1
37+
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"]}}
38+
os: linux
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"]}}
3441
os: linux
3542
- compiler: ghc-8.6.5
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.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"]}}
3744
os: linux
3845
- compiler: ghc-8.4.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.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"]}}
4047
os: linux
4148
- compiler: ghc-8.2.2
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.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"]}}
4350
os: linux
4451
- compiler: ghc-8.0.2
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.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"]}}
4653
os: linux
4754
- compiler: ghc-7.10.3
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-7.10.3","cabal-install-3.0"]}}
55+
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.2"]}}
4956
os: linux
5057
- compiler: ghc-7.8.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.8.4","cabal-install-3.0"]}}
58+
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.2"]}}
5259
os: linux
5360
- compiler: ghc-head
5461
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-head","cabal-install-head"]}}
@@ -67,59 +74,30 @@ before_install:
6774
- TOP=$(pwd)
6875
- "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
6976
- echo $HCNUMVER
70-
- CABAL="$CABAL -vnormal+nowrap+markoutput"
77+
- CABAL="$CABAL -vnormal+nowrap"
7178
- set -o pipefail
72-
- |
73-
echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
74-
echo 'BEGIN { state = "output"; }' >> .colorful.awk
75-
echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
76-
echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
77-
echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
78-
echo ' if (state == "cabal") {' >> .colorful.awk
79-
echo ' print blue($0)' >> .colorful.awk
80-
echo ' } else {' >> .colorful.awk
81-
echo ' print $0' >> .colorful.awk
82-
echo ' }' >> .colorful.awk
83-
echo '}' >> .colorful.awk
84-
- cat .colorful.awk
85-
- |
86-
color_cabal_output () {
87-
awk -f $TOP/.colorful.awk
88-
}
89-
- echo text | color_cabal_output
90-
install:
91-
- ${CABAL} --version
92-
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
9379
- TEST=--enable-tests
9480
- BENCH=--enable-benchmarks
9581
- if [ $HCNUMVER -lt 71000 ] ; then BENCH=--disable-benchmarks ; fi
9682
- HEADHACKAGE=false
97-
- if [ $HCNUMVER -gt 80801 ] ; then HEADHACKAGE=true ; fi
83+
- if [ $HCNUMVER -gt 81001 ] ; then HEADHACKAGE=true ; fi
9884
- rm -f $CABALHOME/config
9985
- |
100-
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
101-
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
102-
echo "write-ghc-environment-files: always" >> $CABALHOME/config
103-
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
104-
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
105-
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
106-
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
107-
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
108-
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
109-
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
110-
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
111-
echo "install-dirs user" >> $CABALHOME/config
112-
echo " prefix: $CABALHOME" >> $CABALHOME/config
113-
echo "repository hackage.haskell.org" >> $CABALHOME/config
114-
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
115-
echo " secure: True" >> $CABALHOME/config
116-
echo " key-threshold: 3" >> $CABALHOME/config
117-
echo " root-keys:" >> $CABALHOME/config
118-
echo " fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >> $CABALHOME/config
119-
echo " 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >> $CABALHOME/config
120-
echo " 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >> $CABALHOME/config
121-
echo " 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >> $CABALHOME/config
122-
echo " 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >> $CABALHOME/config
86+
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
87+
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
88+
echo "write-ghc-environment-files: always" >> $CABALHOME/config
89+
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
90+
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
91+
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
92+
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
93+
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
94+
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
95+
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
96+
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
97+
echo "install-dirs user" >> $CABALHOME/config
98+
echo " prefix: $CABALHOME" >> $CABALHOME/config
99+
echo "repository hackage.haskell.org" >> $CABALHOME/config
100+
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
123101
- |
124102
if $HEADHACKAGE; then
125103
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config
@@ -131,6 +109,9 @@ install:
131109
echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
132110
echo " key-threshold: 3" >> $CABALHOME/config
133111
fi
112+
install:
113+
- ${CABAL} --version
114+
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
134115
- |
135116
echo "program-default-options" >> $CABALHOME/config
136117
echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
@@ -142,20 +123,22 @@ install:
142123
- touch cabal.project
143124
- |
144125
echo "packages: ." >> cabal.project
126+
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package unordered-containers' >> cabal.project ; fi
127+
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
145128
- |
146129
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(binary|containers|unordered-containers)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
147130
- cat cabal.project || true
148131
- cat cabal.project.local || true
149132
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
150-
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
133+
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
151134
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
152135
- rm cabal.project.freeze
153-
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
154-
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
136+
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
137+
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
155138
script:
156139
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
157140
# Packaging...
158-
- ${CABAL} v2-sdist all | color_cabal_output
141+
- ${CABAL} v2-sdist all
159142
# Unpacking...
160143
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
161144
- cd ${DISTDIR} || false
@@ -167,25 +150,27 @@ script:
167150
- touch cabal.project
168151
- |
169152
echo "packages: ${PKGDIR_unordered_containers}" >> cabal.project
153+
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package unordered-containers' >> cabal.project ; fi
154+
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
170155
- |
171156
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(binary|containers|unordered-containers)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
172157
- cat cabal.project || true
173158
- cat cabal.project.local || true
174159
# Building...
175160
# this builds all libraries and executables (without tests/benchmarks)
176-
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
161+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
177162
# Building with tests and benchmarks...
178163
# build & run tests, build benchmarks
179-
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
164+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
180165
# Testing...
181-
- ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
166+
- ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
182167
# cabal check...
183168
- (cd ${PKGDIR_unordered_containers} && ${CABAL} -vnormal check)
184169
# haddock...
185-
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
170+
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
186171
# Building without installed constraints for packages in global-db...
187172
- rm -f cabal.project.local
188-
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
173+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
189174

190-
# REGENDATA ("0.9.20191209",["--benchmarks-jobs=>= 7.10","--ghc-head","--installed=-containers","--installed=-binary","unordered-containers.cabal"])
175+
# REGENDATA ("0.10.1",["--benchmarks-jobs= >=7.10","--ghc-head","--installed=-containers","--installed=-binary","unordered-containers.cabal"])
191176
# EOF

‎unordered-containers.cabal

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,16 @@ category: Data
2020
build-type: Simple
2121
cabal-version: >=1.10
2222
extra-source-files: CHANGES.md
23-
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
23+
24+
tested-with:
25+
GHC ==8.10.1
26+
|| ==8.8.3
27+
|| ==8.6.5
28+
|| ==8.4.4
29+
|| ==8.2.2
30+
|| ==8.0.2
31+
|| ==7.10.3
32+
|| ==7.8.4
2433

2534
flag debug
2635
description: Enable debug support

0 commit comments

Comments
 (0)