Skip to content

Commit 042d354

Browse files
sjakobitreeowl
sjakobi
authored and
treeowl
committed
Fix and update Travis CI config (#243)
* Add jobs using GHC 8.6 and 8.8. * Benchmarks are compiled with GHC >= 7.10. This is simplified by using gauge instead of criterion, which removes a dependency cycle.
1 parent fc5f8dc commit 042d354

File tree

4 files changed

+168
-109
lines changed

4 files changed

+168
-109
lines changed

‎.travis.yml

Lines changed: 164 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,132 +1,191 @@
11
# This Travis job script has been generated by a script via
22
#
3-
# make_travis_yml_2.hs '-o' 'travis.yml' 'unordered-containers.cabal'
3+
# haskell-ci '--benchmarks-jobs=>= 7.10' '--ghc-head' '--installed=-containers' '--installed=-binary' 'unordered-containers.cabal'
44
#
5-
# For more information, see https://github.com/hvr/multi-ghc-travis
5+
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
7+
# version: 0.9.20191209
8+
#
9+
version: ~> 1.0
710
language: c
8-
sudo: false
9-
11+
os: linux
12+
dist: xenial
1013
git:
11-
submodules: false # whether to recursively clone submodules
12-
14+
# whether to recursively clone submodules
15+
submodules: false
1316
cache:
1417
directories:
1518
- $HOME/.cabal/packages
1619
- $HOME/.cabal/store
17-
20+
- $HOME/.hlint
1821
before_cache:
19-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
22+
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2023
# remove files that are regenerated by 'cabal update'
21-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
22-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
23-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
24-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
25-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
26-
27-
- rm -fv $HOME/.cabal/packages/head.hackage
28-
29-
matrix:
24+
- rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
25+
- rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
26+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
27+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
28+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
29+
- rm -rfv $CABALHOME/packages/head.hackage
30+
jobs:
3031
include:
31-
- compiler: "ghc-7.8.4"
32-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
33-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.0,ghc-7.8.4], sources: [hvr-ghc]}}
34-
- compiler: "ghc-7.10.3"
35-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
36-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.0,ghc-7.10.3], sources: [hvr-ghc]}}
37-
- compiler: "ghc-8.0.2"
38-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
39-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
40-
- compiler: "ghc-8.2.2"
41-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
42-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
43-
- compiler: "ghc-8.4.1"
44-
env: GHCHEAD=true
45-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
46-
- compiler: "ghc-head"
47-
env: GHCHEAD=true
48-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}}
49-
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"]}}
34+
os: linux
35+
- 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"]}}
37+
os: linux
38+
- 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"]}}
40+
os: linux
41+
- 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"]}}
43+
os: linux
44+
- 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"]}}
46+
os: linux
47+
- 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"]}}
49+
os: linux
50+
- 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"]}}
52+
os: linux
53+
- compiler: ghc-head
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-head","cabal-install-head"]}}
55+
os: linux
5056
allow_failures:
51-
- compiler: "ghc-8.4.1"
52-
- compiler: "ghc-head"
53-
57+
- compiler: ghc-head
5458
before_install:
55-
- HC=${CC}
56-
- HCPKG=${HC/ghc/ghc-pkg}
59+
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
60+
- WITHCOMPILER="-w $HC"
61+
- HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
62+
- HCPKG="$HC-pkg"
5763
- unset CC
58-
- "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH"
59-
64+
- CABAL=/opt/ghc/bin/cabal
65+
- CABALHOME=$HOME/.cabal
66+
- export PATH="$CABALHOME/bin:$PATH"
67+
- TOP=$(pwd)
68+
- "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
69+
- echo $HCNUMVER
70+
- CABAL="$CABAL -vnormal+nowrap+markoutput"
71+
- 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
6090
install:
61-
- cabal --version
91+
- ${CABAL} --version
6292
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
63-
- BENCH=${BENCH---disable-benchmarks}
64-
- TEST=${TEST---enable-tests}
65-
- HADDOCK=${HADDOCK-true}
66-
- INSTALLED=${INSTALLED-true}
67-
- GHCHEAD=${GHCHEAD-false}
68-
- travis_retry cabal update -v
69-
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
70-
- rm -fv cabal.project.local
71-
- "printf 'packages: \".\"\\n' > cabal.project"
72-
# Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
93+
- TEST=--enable-tests
94+
- BENCH=--enable-benchmarks
95+
- if [ $HCNUMVER -lt 71000 ] ; then BENCH=--disable-benchmarks ; fi
96+
- HEADHACKAGE=false
97+
- if [ $HCNUMVER -gt 80801 ] ; then HEADHACKAGE=true ; fi
98+
- rm -f $CABALHOME/config
7399
- |
74-
if $GHCHEAD; then
75-
echo 'allow-newer: *:base, *:template-haskell' >> cabal.project
76-
echo 'repository head.hackage' >> cabal.project
77-
echo ' url: http://head.hackage.haskell.org/' >> cabal.project
78-
echo ' secure: True' >> cabal.project
79-
echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> cabal.project
80-
echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> cabal.project
81-
echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> cabal.project
82-
echo ' key-threshold: 3' >> cabal.project
83-
fi
84-
- cat cabal.project
85-
- if $GHCHEAD; then cabal new-update head.hackage -v; fi
86-
- if [ -f "./configure.ac" ]; then
87-
(cd "."; autoreconf -i);
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
123+
- |
124+
if $HEADHACKAGE; then
125+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config
126+
echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config
127+
echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config
128+
echo " secure: True" >> $CABALHOME/config
129+
echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config
130+
echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config
131+
echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
132+
echo " key-threshold: 3" >> $CABALHOME/config
88133
fi
89-
- rm -f cabal.project.freeze
90-
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
91-
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
92-
- rm -rf "."/.ghc.environment.* "."/dist
93-
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
94-
95-
# Here starts the actual work to be performed for the package under test;
96-
# any command which exits with a non-zero exit code causes the build to fail.
134+
- |
135+
echo "program-default-options" >> $CABALHOME/config
136+
echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
137+
- cat $CABALHOME/config
138+
- rm -fv cabal.project cabal.project.local cabal.project.freeze
139+
- travis_retry ${CABAL} v2-update -v
140+
# Generate cabal.project
141+
- rm -rf cabal.project cabal.project.local cabal.project.freeze
142+
- touch cabal.project
143+
- |
144+
echo "packages: ." >> cabal.project
145+
- |
146+
- "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"
147+
- cat cabal.project || true
148+
- cat cabal.project.local || true
149+
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
150+
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
151+
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
152+
- 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
97155
script:
98-
# test that source-distributions can be generated
99-
- (cd "." && cabal sdist)
100-
- mv "."/dist/unordered-containers-*.tar.gz ${DISTDIR}/
156+
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
157+
# Packaging...
158+
- ${CABAL} v2-sdist all | color_cabal_output
159+
# Unpacking...
160+
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
101161
- cd ${DISTDIR} || false
102-
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
103-
- "printf 'packages: unordered-containers-*/*.cabal\\n' > cabal.project"
104-
# Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
162+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
163+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
164+
- PKGDIR_unordered_containers="$(find . -maxdepth 1 -type d -regex '.*/unordered-containers-[0-9.]*')"
165+
# Generate cabal.project
166+
- rm -rf cabal.project cabal.project.local cabal.project.freeze
167+
- touch cabal.project
105168
- |
106-
if $GHCHEAD; then
107-
echo 'allow-newer: *:base, *:template-haskell' >> cabal.project
108-
echo 'repository head.hackage' >> cabal.project
109-
echo ' url: http://head.hackage.haskell.org/' >> cabal.project
110-
echo ' secure: True' >> cabal.project
111-
echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> cabal.project
112-
echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> cabal.project
113-
echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> cabal.project
114-
echo ' key-threshold: 3' >> cabal.project
115-
fi
116-
- cat cabal.project
169+
echo "packages: ${PKGDIR_unordered_containers}" >> cabal.project
170+
- |
171+
- "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"
172+
- cat cabal.project || true
173+
- cat cabal.project.local || true
174+
# Building...
117175
# this builds all libraries and executables (without tests/benchmarks)
118-
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
119-
120-
# Build with installed constraints for packages in global-db
121-
- if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi
122-
176+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
177+
# Building with tests and benchmarks...
123178
# build & run tests, build benchmarks
124-
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
125-
- if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi
126-
127-
# haddock
128-
- rm -rf ./dist-newstyle
129-
- if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi
179+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
180+
# Testing...
181+
- ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
182+
# cabal check...
183+
- (cd ${PKGDIR_unordered_containers} && ${CABAL} -vnormal check)
184+
# haddock...
185+
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
186+
# Building without installed constraints for packages in global-db...
187+
- rm -f cabal.project.local
188+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
130189

131-
# REGENDATA ["-o","travis.yml","unordered-containers.cabal"]
190+
# REGENDATA ("0.9.20191209",["--benchmarks-jobs=>= 7.10","--ghc-head","--installed=-containers","--installed=-binary","unordered-containers.cabal"])
132191
# EOF

‎benchmarks/Benchmarks.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module Main where
44

55
import Control.DeepSeq
66
import Control.DeepSeq.Generics (genericRnf)
7-
import Criterion.Main (bench, bgroup, defaultMain, env, nf, whnf)
7+
import Gauge (bench, bgroup, defaultMain, env, nf, whnf)
88
import Data.Bits ((.&.))
99
import Data.Functor.Identity
1010
import Data.Hashable (Hashable)

‎benchmarks/unordered-containers-benchmarks.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ executable unordered-containers-benchmarks
2323
base,
2424
bytestring,
2525
containers,
26-
criterion,
26+
gauge,
2727
deepseq,
2828
deepseq-generics,
2929
hashmap,

‎unordered-containers.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ category: Data
2020
build-type: Simple
2121
cabal-version: >=1.10
2222
extra-source-files: CHANGES.md
23-
tested-with: GHC==8.4.1, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4
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
2424

2525
flag debug
2626
description: Enable debug support
@@ -200,7 +200,7 @@ benchmark benchmarks
200200
base >= 4.8.0,
201201
bytestring,
202202
containers,
203-
criterion >= 1.0 && < 1.3,
203+
gauge >= 0.2.5 && < 0.3,
204204
deepseq >= 1.1,
205205
deepseq-generics,
206206
hashable >= 1.0.1.1,

0 commit comments

Comments
 (0)