Skip to content

Commit 274bd74

Browse files
svenpannesvenpanne
committed
Test with GHC 8.10.1, too. Updated .travis.yml.
1 parent 50c6a84 commit 274bd74

File tree

2 files changed

+54
-52
lines changed

2 files changed

+54
-52
lines changed

‎.travis.yml‎

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# This Travis job script has been generated by a script via
22
#
3-
# haskell-ci 'OpenGLRaw.cabal' '--output' '.travis.yml' '--apt' 'freeglut3-dev'
3+
# haskell-ci '--submodules' 'OpenGLRaw.cabal' '--output' '.travis.yml' '--apt' 'freeglut3-dev'
44
#
55
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
7-
# version: 0.3.20190429
7+
# version: 0.6
88
#
99
language: c
1010
dist: xenial
@@ -26,32 +26,33 @@ before_cache:
2626
- rm -rfv $CABALHOME/packages/head.hackage
2727
matrix:
2828
include:
29+
- compiler: ghc-8.10.1
30+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.10.1","cabal-install-3.0","freeglut3-dev"]}}
2931
- compiler: ghc-8.8.1
3032
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0","freeglut3-dev"]}}
31-
env: GHCHEAD=true
3233
- compiler: ghc-8.6.5
33-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4","freeglut3-dev"]}}
34+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0","freeglut3-dev"]}}
3435
- compiler: ghc-8.4.3
35-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.3","cabal-install-2.4","freeglut3-dev"]}}
36+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.3","cabal-install-3.0","freeglut3-dev"]}}
3637
- compiler: ghc-8.2.2
37-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4","freeglut3-dev"]}}
38+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0","freeglut3-dev"]}}
3839
- compiler: ghc-8.0.2
39-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4","freeglut3-dev"]}}
40+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0","freeglut3-dev"]}}
4041
- compiler: ghc-7.10.3
41-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4","freeglut3-dev"]}}
42+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-3.0","freeglut3-dev"]}}
4243
- compiler: ghc-7.8.4
43-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4","freeglut3-dev"]}}
44-
allow_failures:
45-
- compiler: ghc-8.8.1
44+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-3.0","freeglut3-dev"]}}
4645
before_install:
4746
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
47+
- WITHCOMPILER="-w $HC"
48+
- HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
4849
- HCPKG="$HC-pkg"
4950
- unset CC
5051
- CABAL=/opt/ghc/bin/cabal
5152
- CABALHOME=$HOME/.cabal
5253
- export PATH="$CABALHOME/bin:$PATH"
5354
- TOP=$(pwd)
54-
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
55+
- "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
5556
- echo $HCNUMVER
5657
- CABAL="$CABAL -vnormal+nowrap+markoutput"
5758
- set -o pipefail
@@ -78,85 +79,85 @@ install:
7879
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
7980
- TEST=--enable-tests
8081
- BENCH=--enable-benchmarks
81-
- GHCHEAD=${GHCHEAD-false}
82+
- HEADHACKAGE=false
8283
- rm -f $CABALHOME/config
8384
- |
84-
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
85-
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
86-
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
87-
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
88-
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
89-
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
90-
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
91-
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
92-
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
93-
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
94-
echo "install-dirs user" >> $CABALHOME/config
95-
echo " prefix: $CABALHOME" >> $CABALHOME/config
96-
echo "repository hackage.haskell.org" >> $CABALHOME/config
97-
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
85+
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
86+
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
87+
echo "write-ghc-environment-files: always" >> $CABALHOME/config
88+
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
89+
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
90+
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
91+
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
92+
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
93+
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
94+
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
95+
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
96+
echo "install-dirs user" >> $CABALHOME/config
97+
echo " prefix: $CABALHOME" >> $CABALHOME/config
98+
echo "repository hackage.haskell.org" >> $CABALHOME/config
99+
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
100+
echo " secure: True" >> $CABALHOME/config
101+
echo " key-threshold: 3" >> $CABALHOME/config
102+
echo " root-keys:" >> $CABALHOME/config
103+
echo " fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >> $CABALHOME/config
104+
echo " 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >> $CABALHOME/config
105+
echo " 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >> $CABALHOME/config
106+
echo " 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >> $CABALHOME/config
107+
echo " 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >> $CABALHOME/config
98108
- |
99-
if $GHCHEAD; then
100-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config
101-
102-
echo "repository head.hackage" >> $CABALHOME/config
103-
echo " url: http://head.hackage.haskell.org/" >> $CABALHOME/config
104-
echo " secure: True" >> $CABALHOME/config
105-
echo " root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740" >> $CABALHOME/config
106-
echo " 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb" >> $CABALHOME/config
107-
echo " 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e" >> $CABALHOME/config
108-
echo " key-threshold: 3" >> $CABALHOME/config
109-
fi
109+
echo "program-default-options" >> $CABALHOME/config
110+
echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
110111
- cat $CABALHOME/config
111112
- rm -fv cabal.project cabal.project.local cabal.project.freeze
112113
- travis_retry ${CABAL} v2-update -v
113114
# Generate cabal.project
114115
- rm -rf cabal.project cabal.project.local cabal.project.freeze
115116
- touch cabal.project
116117
- |
117-
echo 'packages: "."' >> cabal.project
118+
echo "packages: ." >> cabal.project
118119
- |
119-
echo "write-ghc-environment-files: always" >> cabal.project
120120
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(OpenGLRaw)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
121121
- cat cabal.project || true
122122
- cat cabal.project.local || true
123123
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
124-
- ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
124+
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
125125
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
126126
- rm cabal.project.freeze
127-
- ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
128-
- ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
127+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
128+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
129129
script:
130130
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
131131
# Packaging...
132132
- ${CABAL} v2-sdist all | color_cabal_output
133133
# Unpacking...
134134
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
135135
- cd ${DISTDIR} || false
136-
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
136+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
137+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
138+
- PKGDIR_OpenGLRaw="$(find . -maxdepth 1 -type d -regex '.*/OpenGLRaw-[0-9.]*')"
137139
# Generate cabal.project
138140
- rm -rf cabal.project cabal.project.local cabal.project.freeze
139141
- touch cabal.project
140142
- |
141-
echo 'packages: "OpenGLRaw-*/*.cabal"' >> cabal.project
143+
echo "packages: ${PKGDIR_OpenGLRaw}" >> cabal.project
142144
- |
143-
echo "write-ghc-environment-files: always" >> cabal.project
144145
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(OpenGLRaw)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
145146
- cat cabal.project || true
146147
- cat cabal.project.local || true
147148
# Building...
148149
# this builds all libraries and executables (without tests/benchmarks)
149-
- ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
150+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
150151
# Building with tests and benchmarks...
151152
# build & run tests, build benchmarks
152-
- ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
153+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
153154
# cabal check...
154-
- (cd OpenGLRaw-* && ${CABAL} -vnormal check)
155+
- (cd ${PKGDIR_OpenGLRaw} && ${CABAL} -vnormal check)
155156
# haddock...
156-
- ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
157+
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
157158
# Building without installed constraints for packages in global-db...
158159
- rm -f cabal.project.local
159-
- ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
160+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
160161

161-
# REGENDATA ["OpenGLRaw.cabal","--output",".travis.yml","--apt","freeglut3-dev"]
162+
# REGENDATA ("0.6",["--submodules","OpenGLRaw.cabal","--output",".travis.yml","--apt","freeglut3-dev"])
162163
# EOF

‎OpenGLRaw.cabal‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ tested-with:
3535
GHC == 8.4.3
3636
GHC == 8.6.5
3737
GHC == 8.8.1
38+
GHC == 8.10.1
3839
cabal-version: >= 1.10
3940
extra-source-files:
4041
CHANGELOG.md

0 commit comments

Comments
 (0)