Skip to content

Commit 7a76f19

Browse files
svenpannesvenpanne
committed
Test with 8.2.2 and 8.4.1, too. Regenerate .travis.yml.
1 parent a8a75e7 commit 7a76f19

File tree

2 files changed

+119
-82
lines changed

2 files changed

+119
-82
lines changed

‎.travis.yml‎

Lines changed: 116 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,140 @@
1-
# This file has been generated -- see https://github.com/hvr/multi-ghc-travis
1+
# This Travis job script has been generated by a script via
2+
#
3+
# runghc make_travis_yml_2.hs '-o' '.travis.yml' 'GLUT.cabal'
4+
#
5+
# For more information, see https://github.com/hvr/multi-ghc-travis
6+
#
27
language: c
38
sudo: false
49

10+
git:
11+
submodules: false # whether to recursively clone submodules
12+
513
cache:
614
directories:
7-
- $HOME/.cabsnap
815
- $HOME/.cabal/packages
16+
- $HOME/.cabal/store
917

1018
before_cache:
1119
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
12-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar
20+
# 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 -rfv $HOME/.cabal/packages/head.hackage
1328

1429
matrix:
1530
include:
16-
- env: CABALVER=1.16 GHCVER=7.0.4
17-
compiler: ": #GHC 7.0.4"
18-
addons: {apt: {packages: [cabal-install-1.16,ghc-7.0.4,freeglut3-dev], sources: [hvr-ghc]}}
19-
- env: CABALVER=1.16 GHCVER=7.2.2
20-
compiler: ": #GHC 7.2.2"
21-
addons: {apt: {packages: [cabal-install-1.16,ghc-7.2.2,freeglut3-dev], sources: [hvr-ghc]}}
22-
- env: CABALVER=1.16 GHCVER=7.4.2
23-
compiler: ": #GHC 7.4.2"
24-
addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2,freeglut3-dev], sources: [hvr-ghc]}}
25-
- env: CABALVER=1.16 GHCVER=7.6.3
26-
compiler: ": #GHC 7.6.3"
27-
addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3,freeglut3-dev], sources: [hvr-ghc]}}
28-
- env: CABALVER=1.18 GHCVER=7.8.4
29-
compiler: ": #GHC 7.8.4"
30-
addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,freeglut3-dev], sources: [hvr-ghc]}}
31-
- env: CABALVER=1.22 GHCVER=7.10.3
32-
compiler: ": #GHC 7.10.3"
33-
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,freeglut3-dev], sources: [hvr-ghc]}}
34-
- env: CABALVER=1.24 GHCVER=8.0.2
35-
compiler: ": #GHC 8.0.2"
36-
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2,freeglut3-dev], sources: [hvr-ghc]}}
37-
- env: CABALVER=1.24 GHCVER=8.2.1
38-
compiler: ": #GHC 8.2.1"
39-
addons: {apt: {packages: [cabal-install-1.24,ghc-8.2.1,freeglut3-dev], sources: [hvr-ghc]}}
40-
- env: CABALVER=head GHCVER=head
41-
compiler: ": #GHC head"
42-
addons: {apt: {packages: [cabal-install-head,ghc-head,freeglut3-dev], sources: [hvr-ghc]}}
31+
- compiler: "ghc-7.0.4"
32+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
33+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.0.4], sources: [hvr-ghc]}}
34+
- compiler: "ghc-7.2.2"
35+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
36+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.2.2], sources: [hvr-ghc]}}
37+
- compiler: "ghc-7.4.2"
38+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
39+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.4.2], sources: [hvr-ghc]}}
40+
- compiler: "ghc-7.6.3"
41+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
42+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.6.3], sources: [hvr-ghc]}}
43+
- compiler: "ghc-7.8.4"
44+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
45+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}
46+
- compiler: "ghc-7.10.3"
47+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
48+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
49+
- compiler: "ghc-8.0.2"
50+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
51+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
52+
- compiler: "ghc-8.2.2"
53+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
54+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
55+
- compiler: "ghc-8.4.1"
56+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
57+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
58+
- compiler: "ghc-head"
59+
env: GHCHEAD=true
60+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}}
4361

4462
allow_failures:
45-
- env: CABALVER=head GHCVER=head
63+
- compiler: "ghc-head"
4664

4765
before_install:
48-
- unset CC
49-
- export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
66+
- HC=${CC}
67+
- HCPKG=${HC/ghc/ghc-pkg}
68+
- unset CC
69+
- ROOTDIR=$(pwd)
70+
- mkdir -p $HOME/.local/bin
71+
- "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
72+
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
73+
- echo $HCNUMVER
5074

5175
install:
52-
- cabal --version
53-
- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
54-
- if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
55-
then
56-
zcat $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz >
57-
$HOME/.cabal/packages/hackage.haskell.org/00-index.tar;
58-
fi
59-
- travis_retry cabal update -v
60-
- sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
61-
- cabal install --only-dependencies --enable-tests --enable-benchmarks --dry -v > installplan.txt
62-
- sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt
63-
64-
# check whether current requested install-plan matches cached package-db snapshot
65-
- if diff -u installplan.txt $HOME/.cabsnap/installplan.txt;
66-
then
67-
echo "cabal build-cache HIT";
68-
rm -rfv .ghc;
69-
cp -a $HOME/.cabsnap/ghc $HOME/.ghc;
70-
cp -a $HOME/.cabsnap/lib $HOME/.cabsnap/share $HOME/.cabsnap/bin $HOME/.cabal/;
71-
else
72-
echo "cabal build-cache MISS";
73-
rm -rf $HOME/.cabsnap;
74-
mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
75-
cabal install --only-dependencies --enable-tests --enable-benchmarks;
76-
fi
77-
78-
# snapshot package-db on cache miss
79-
- if [ ! -d $HOME/.cabsnap ];
80-
then
81-
echo "snapshotting package-db to build-cache";
82-
mkdir $HOME/.cabsnap;
83-
cp -a $HOME/.ghc $HOME/.cabsnap/ghc;
84-
cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
85-
fi
76+
- cabal --version
77+
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
78+
- BENCH=${BENCH---enable-benchmarks}
79+
- TEST=${TEST---enable-tests}
80+
- HADDOCK=${HADDOCK-true}
81+
- INSTALLED=${INSTALLED-true}
82+
- GHCHEAD=${GHCHEAD-false}
83+
- travis_retry cabal update -v
84+
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
85+
- rm -fv cabal.project cabal.project.local
86+
# Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
87+
- |
88+
if $GHCHEAD; then
89+
sed -i.bak 's/-- allow-newer:.*/allow-newer: *:base, *:template-haskell, *:ghc, *:Cabal/' ${HOME}/.cabal/config
90+
91+
echo 'repository head.hackage' >> ${HOME}/.cabal/config
92+
echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config
93+
echo ' secure: True' >> ${HOME}/.cabal/config
94+
echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config
95+
echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config
96+
echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config
97+
echo ' key-threshold: 3' >> ${HOME}/.cabal.config
98+
99+
cabal new-update head.hackage -v
100+
fi
101+
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
102+
- "printf 'packages: \".\"\\n' > cabal.project"
103+
- cat cabal.project
104+
- if [ -f "./configure.ac" ]; then
105+
(cd "." && autoreconf -i);
106+
fi
107+
- rm -f cabal.project.freeze
108+
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
109+
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
110+
- rm -rf .ghc.environment.* "."/dist
111+
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
86112

87113
# Here starts the actual work to be performed for the package under test;
88114
# any command which exits with a non-zero exit code causes the build to fail.
89115
script:
90-
- if [ -f configure.ac ]; then autoreconf -i; fi
91-
- cabal configure --enable-tests --enable-benchmarks --ghc-options=-Werror -v2 # -v2 provides useful information for debugging
92-
- cabal build # this builds all libraries and executables (including tests/benchmarks)
93-
- cabal test
94-
- cabal check
95-
- cabal haddock # tests that documentation can be generated
96-
- cabal sdist # tests that a source-distribution can be generated
97-
98-
# Check that the resulting source distribution can be built & installed.
99-
# If there are no other `.tar.gz` files in `dist`, this can be even simpler:
100-
# `cabal install --force-reinstalls dist/*-*.tar.gz`
101-
- SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
102-
(cd dist && cabal install --force-reinstalls "$SRC_TGZ")
116+
# test that source-distributions can be generated
117+
- (cd "." && cabal sdist)
118+
- mv "."/dist/GLUT-*.tar.gz ${DISTDIR}/
119+
- cd ${DISTDIR} || false
120+
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
121+
- "printf 'packages: GLUT-*/*.cabal\\n' > cabal.project"
122+
- cat cabal.project
123+
# this builds all libraries and executables (without tests/benchmarks)
124+
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
125+
126+
# Build with installed constraints for packages in global-db
127+
- 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
128+
129+
# build & run tests, build benchmarks
130+
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
131+
132+
# cabal check
133+
- (cd GLUT-* && cabal check)
134+
135+
# haddock
136+
- rm -rf ./dist-newstyle
137+
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
103138

139+
# REGENDATA ["-o",".travis.yml","GLUT.cabal"]
104140
# EOF

‎GLUT.cabal‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ tested-with:
2323
GHC == 7.8.4
2424
GHC == 7.10.3
2525
GHC == 8.0.2
26-
GHC == 8.2.1
27-
GHC == 8.3
26+
GHC == 8.2.2
27+
GHC == 8.4.1
28+
GHC == 8.5.*
2829
cabal-version: >= 1.10
2930
extra-source-files:
3031
CHANGELOG.md

0 commit comments

Comments
 (0)