Skip to content

Commit a414bd1

Browse files
svenpannesvenpanne
committed
Test with GHC 8.6.5 instead of 8.6.3. Add GHC 8.8.1.
1 parent 040a442 commit a414bd1

File tree

2 files changed

+126
-106
lines changed

2 files changed

+126
-106
lines changed

‎.travis.yml‎

Lines changed: 124 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,142 +1,162 @@
11
# This Travis job script has been generated by a script via
22
#
3-
# runghc make_travis_yml_2.hs '--ghc-head' '-o' '.travis.yml' 'OpenGLRaw.cabal'
3+
# haskell-ci 'OpenGLRaw.cabal' '--output' '.travis.yml'
44
#
55
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
7+
# version: 0.3.20190429
8+
#
79
language: c
8-
sudo: false
9-
10+
dist: xenial
1011
git:
11-
submodules: true # whether to recursively clone submodules
12-
12+
# whether to recursively clone submodules
13+
submodules: false
1314
cache:
1415
directories:
1516
- $HOME/.cabal/packages
1617
- $HOME/.cabal/store
17-
1818
before_cache:
19-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
19+
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2020
# 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
28-
21+
- rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
22+
- rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
23+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
24+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
25+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
26+
- rm -rfv $CABALHOME/packages/head.hackage
2927
matrix:
3028
include:
31-
- compiler: "ghc-8.6.3"
32-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
33-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}
34-
- compiler: "ghc-8.4.3"
35-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
36-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}}
37-
- compiler: "ghc-8.2.2"
38-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
39-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
40-
- compiler: "ghc-8.0.2"
41-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
42-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
43-
- compiler: "ghc-7.10.3"
44-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
45-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
46-
- compiler: "ghc-7.8.4"
47-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
48-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}}
49-
- compiler: "ghc-head"
29+
- compiler: ghc-8.8.1
30+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
5031
env: GHCHEAD=true
51-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}}
52-
32+
- compiler: ghc-8.6.5
33+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
34+
- compiler: ghc-8.4.3
35+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.3","cabal-install-2.4"]}}
36+
- compiler: ghc-8.2.2
37+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
38+
- compiler: ghc-8.0.2
39+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
40+
- compiler: ghc-7.10.3
41+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}}
42+
- compiler: ghc-7.8.4
43+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}}
5344
allow_failures:
54-
- compiler: "ghc-head"
55-
45+
- compiler: ghc-8.8.1
5646
before_install:
57-
- HC=${CC}
58-
- HCPKG=${HC/ghc/ghc-pkg}
47+
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
48+
- HCPKG="$HC-pkg"
5949
- unset CC
60-
- ROOTDIR=$(pwd)
61-
- mkdir -p $HOME/.local/bin
62-
- "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
50+
- CABAL=/opt/ghc/bin/cabal
51+
- CABALHOME=$HOME/.cabal
52+
- export PATH="$CABALHOME/bin:$PATH"
53+
- TOP=$(pwd)
6354
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
6455
- echo $HCNUMVER
65-
56+
- CABAL="$CABAL -vnormal+nowrap+markoutput"
57+
- set -o pipefail
58+
- |
59+
echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
60+
echo 'BEGIN { state = "output"; }' >> .colorful.awk
61+
echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
62+
echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
63+
echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
64+
echo ' if (state == "cabal") {' >> .colorful.awk
65+
echo ' print blue($0)' >> .colorful.awk
66+
echo ' } else {' >> .colorful.awk
67+
echo ' print $0' >> .colorful.awk
68+
echo ' }' >> .colorful.awk
69+
echo '}' >> .colorful.awk
70+
- cat .colorful.awk
71+
- |
72+
color_cabal_output () {
73+
awk -f $TOP/.colorful.awk
74+
}
75+
- echo text | color_cabal_output
6676
install:
67-
- cabal --version
77+
- ${CABAL} --version
6878
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
69-
- BENCH=${BENCH---enable-benchmarks}
70-
- TEST=${TEST---enable-tests}
71-
- HADDOCK=${HADDOCK-true}
72-
- UNCONSTRAINED=${UNCONSTRAINED-true}
73-
- NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
79+
- TEST=--enable-tests
80+
- BENCH=--enable-benchmarks
7481
- GHCHEAD=${GHCHEAD-false}
75-
- travis_retry cabal update -v
76-
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
77-
- rm -fv cabal.project cabal.project.local
78-
# Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
82+
- rm -f $CABALHOME/config
83+
- |
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
7998
- |
8099
if $GHCHEAD; then
81-
sed -i 's/-- allow-newer: .*/allow-newer: *:base/' ${HOME}/.cabal/config
82-
for pkg in $($HCPKG list --simple-output); do pkg=$(echo $pkg | sed 's/-[^-]*$//'); sed -i "s/allow-newer: /allow-newer: *:$pkg, /" ${HOME}/.cabal/config; done
83-
84-
echo 'repository head.hackage' >> ${HOME}/.cabal/config
85-
echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config
86-
echo ' secure: True' >> ${HOME}/.cabal/config
87-
echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config
88-
echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config
89-
echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config
90-
echo ' key-threshold: 3' >> ${HOME}/.cabal.config
91-
92-
grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
93-
94-
cabal new-update head.hackage -v
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
95109
fi
96-
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
97-
- "printf 'packages: \".\"\\n' > cabal.project"
98-
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
99-
- touch cabal.project.local
100-
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- OpenGLRaw | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
110+
- cat $CABALHOME/config
111+
- rm -fv cabal.project cabal.project.local cabal.project.freeze
112+
- travis_retry ${CABAL} v2-update -v
113+
# Generate cabal.project
114+
- rm -rf cabal.project cabal.project.local cabal.project.freeze
115+
- touch cabal.project
116+
- |
117+
echo 'packages: "."' >> cabal.project
118+
- |
119+
echo "write-ghc-environment-files: always" >> cabal.project
120+
- "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"
101121
- cat cabal.project || true
102122
- cat cabal.project.local || true
103-
- if [ -f "./configure.ac" ]; then
104-
(cd "." && autoreconf -i);
105-
fi
106-
- rm -f cabal.project.freeze
107-
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
108-
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
109-
- rm -rf .ghc.environment.* "."/dist
110-
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
111-
112-
# Here starts the actual work to be performed for the package under test;
113-
# any command which exits with a non-zero exit code causes the build to fail.
123+
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
124+
- ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
125+
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
126+
- 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
114129
script:
115-
# test that source-distributions can be generated
116-
- cabal new-sdist all
130+
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
131+
# Packaging...
132+
- ${CABAL} v2-sdist all | color_cabal_output
133+
# Unpacking...
117134
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
118135
- cd ${DISTDIR} || false
119136
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
120-
- "printf 'packages: OpenGLRaw-*/*.cabal\\n' > cabal.project"
121-
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
122-
- touch cabal.project.local
123-
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- OpenGLRaw | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
137+
# Generate cabal.project
138+
- rm -rf cabal.project cabal.project.local cabal.project.freeze
139+
- touch cabal.project
140+
- |
141+
echo 'packages: "OpenGLRaw-*/*.cabal"' >> cabal.project
142+
- |
143+
echo "write-ghc-environment-files: always" >> cabal.project
144+
- "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"
124145
- cat cabal.project || true
125146
- cat cabal.project.local || true
147+
# Building...
126148
# this builds all libraries and executables (without tests/benchmarks)
127-
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
128-
149+
- ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
150+
# Building with tests and benchmarks...
129151
# build & run tests, build benchmarks
130-
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
131-
132-
# cabal check
133-
- (cd OpenGLRaw-* && cabal check)
134-
135-
# haddock
136-
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
137-
138-
# Build without installed constraints for packages in global-db
139-
- if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi
140-
141-
# REGENDATA ["--ghc-head","-o",".travis.yml","OpenGLRaw.cabal"]
152+
- ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
153+
# cabal check...
154+
- (cd OpenGLRaw-* && ${CABAL} -vnormal check)
155+
# haddock...
156+
- ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
157+
# Building without installed constraints for packages in global-db...
158+
- rm -f cabal.project.local
159+
- ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
160+
161+
# REGENDATA ["OpenGLRaw.cabal","--output",".travis.yml"]
142162
# EOF

‎OpenGLRaw.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ tested-with:
3333
GHC == 8.0.2
3434
GHC == 8.2.2
3535
GHC == 8.4.3
36-
GHC == 8.6.3
37-
GHC == 8.7.*
36+
GHC == 8.6.5
37+
GHC == 8.8.1
3838
cabal-version: >= 1.10
3939
extra-source-files:
4040
CHANGELOG.md

0 commit comments

Comments
 (0)