Skip to content

Commit 5625cc5

Browse files
maoemaoe
authored
Merge pull request #99 from maoe/update-travis
Support GHC 8.8.1
2 parents 036358b + 5f1c11c commit 5625cc5

File tree

5 files changed

+263
-101
lines changed

5 files changed

+263
-101
lines changed

‎.travis.yml‎

Lines changed: 162 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,190 @@
11
# This Travis job script has been generated by a script via
22
#
3-
# runghc make_travis_yml_2.hs '-o' '.travis.yml' 'threadscope.cabal' 'libgtk2.0-dev' '--osx=8.2.2'
3+
# haskell-ci 'threadscope.cabal' '--apt' 'libgtk2.0-dev' '--osx' '8.6.5' '--osx' '8.8.1' '--travis-patches' '.travis/osx.patch' '--travis-patches' '.travis/deploy.patch' '--travis-patches' '.travis/allow-failrues.patch'
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.20191126
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
20+
- $HOME/.hlint
1721
- $HOME/.ghc-install
18-
1922
before_cache:
20-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
23+
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2124
# remove files that are regenerated by 'cabal update'
22-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
23-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
24-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
25-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
26-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
27-
28-
- rm -rfv $HOME/.cabal/packages/head.hackage
29-
30-
matrix:
25+
- rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
26+
- rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
27+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
28+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
29+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
30+
- rm -rfv $CABALHOME/packages/head.hackage
31+
jobs:
3132
include:
32-
- compiler: "ghc-7.10.2"
33-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
34-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.2,libgtk2.0-dev], sources: [hvr-ghc]}}
35-
- compiler: "ghc-8.0.2"
36-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
37-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2,libgtk2.0-dev], sources: [hvr-ghc]}}
38-
- compiler: "ghc-8.2.2"
39-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
40-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2,libgtk2.0-dev], sources: [hvr-ghc]}}
41-
- compiler: "ghc-8.4.2"
42-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
43-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.2,libgtk2.0-dev], sources: [hvr-ghc]}}
44-
- compiler: "ghc-8.2.2"
45-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
46-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2,libgtk2.0-dev], sources: [hvr-ghc]}}
33+
- compiler: ghc-8.8.1
34+
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","libgtk2.0-dev"]}}
35+
os: linux
36+
- compiler: ghc-8.6.5
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.6.5","cabal-install-3.0","libgtk2.0-dev"]}}
38+
os: linux
39+
- compiler: ghc-8.4.4
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.4.4","cabal-install-3.0","libgtk2.0-dev"]}}
41+
os: linux
42+
- compiler: ghc-8.2.2
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.2.2","cabal-install-3.0","libgtk2.0-dev"]}}
44+
os: linux
45+
- compiler: ghc-8.8.1
46+
addons: {"homebrew": {"packages":["gtk+", "gtk-mac-integration"]}}
47+
env: PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
4748
os: osx
48-
49+
osx_image: xcode11
50+
- compiler: ghc-8.6.5
51+
addons: {"homebrew": {"packages":["gtk+", "gtk-mac-integration"]}}
52+
env: PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
53+
os: osx
54+
osx_image: xcode11
55+
allow_failures:
56+
- compiler: ghc-8.8.1
57+
os: linux
4958
before_install:
50-
- HC=${CC}
51-
- 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+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then HADDOCK=$(echo $HADDOCK | sed "s:^/opt:$HOME/.ghc-install:"); fi
63+
- HCPKG="$HC-pkg"
5264
- unset CC
53-
- ROOTDIR=$(pwd)
54-
- mkdir -p $HOME/.local/bin
55-
- "if [ \"$(uname)\" = \"Darwin\" ]; then brew update; brew install gtk+ gtk-mac-integration; brew upgrade python@3; curl https://haskell.futurice.com/haskell-on-macos.py | python3 - --make-dirs --install-dir=$HOME/.ghc-install --cabal-alias=head install cabal-install-head ${HC}; fi"
56-
- "if [ \"$(uname)\" = \"Darwin\" ]; then PATH=$HOME/.ghc-install/ghc/bin:$HOME/local/bin:$PATH; else PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH; fi"
57-
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
65+
- CABAL=/opt/ghc/bin/cabal
66+
- CABALHOME=$HOME/.cabal
67+
- export PATH="$CABALHOME/bin:$PATH"
68+
- TOP=$(pwd)
69+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then curl https://haskell.futurice.com/haskell-on-macos.py | python3 - --make-dirs --install-dir=$HOME/.ghc-install --cabal-alias=3.0.0.0 install cabal-install-3.0.0.0 ${TRAVIS_COMPILER}; fi
70+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then HC=$HOME/.ghc-install/ghc/bin/$TRAVIS_COMPILER; WITHCOMPILER="-w $HC"; HCPKG=${HC/ghc/ghc-pkg}; CABAL=$HOME/.ghc-install/ghc/bin/cabal; fi
71+
- "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
5872
- echo $HCNUMVER
59-
73+
- CABAL="$CABAL -vnormal+nowrap+markoutput"
74+
- set -o pipefail
75+
- |
76+
echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
77+
echo 'BEGIN { state = "output"; }' >> .colorful.awk
78+
echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
79+
echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
80+
echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
81+
echo ' if (state == "cabal") {' >> .colorful.awk
82+
echo ' print blue($0)' >> .colorful.awk
83+
echo ' } else {' >> .colorful.awk
84+
echo ' print $0' >> .colorful.awk
85+
echo ' }' >> .colorful.awk
86+
echo '}' >> .colorful.awk
87+
- cat .colorful.awk
88+
- |
89+
color_cabal_output () {
90+
awk -f $TOP/.colorful.awk
91+
}
92+
- echo text | color_cabal_output
6093
install:
61-
- cabal --version
94+
- ${CABAL} --version
6295
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
63-
- BENCH=${BENCH---enable-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 cabal.project.local
71-
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
72-
- "printf 'packages: \".\"\\n' > cabal.project"
73-
- cat cabal.project
74-
- if [ -f "./configure.ac" ]; then
75-
(cd "." && autoreconf -i);
96+
- TEST=--enable-tests
97+
- BENCH=--enable-benchmarks
98+
- HEADHACKAGE=false
99+
- rm -f $CABALHOME/config
100+
- |
101+
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
102+
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
103+
echo "write-ghc-environment-files: always" >> $CABALHOME/config
104+
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
105+
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
106+
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
107+
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
108+
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
109+
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
110+
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
111+
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
112+
echo "install-dirs user" >> $CABALHOME/config
113+
echo " prefix: $CABALHOME" >> $CABALHOME/config
114+
echo "repository hackage.haskell.org" >> $CABALHOME/config
115+
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
116+
echo " secure: True" >> $CABALHOME/config
117+
echo " key-threshold: 3" >> $CABALHOME/config
118+
echo " root-keys:" >> $CABALHOME/config
119+
echo " fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >> $CABALHOME/config
120+
echo " 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >> $CABALHOME/config
121+
echo " 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >> $CABALHOME/config
122+
echo " 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >> $CABALHOME/config
123+
echo " 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >> $CABALHOME/config
124+
- |
125+
echo "program-default-options" >> $CABALHOME/config
126+
echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
127+
- cat $CABALHOME/config
128+
- rm -fv cabal.project cabal.project.local cabal.project.freeze
129+
- travis_retry ${CABAL} v2-update -v
130+
# Generate cabal.project
131+
- rm -rf cabal.project cabal.project.local cabal.project.freeze
132+
- touch cabal.project
133+
- |
134+
echo "packages: ." >> cabal.project
135+
- |
136+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(threadscope)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
137+
- |
138+
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
139+
echo 'constraints: gtk +have-quartz-gtk' >> cabal.project
140+
echo 'allow-newer: Cabal, gtk-mac-integration:gtk' >> cabal.project
76141
fi
77-
- rm -f cabal.project.freeze
78-
- cabal new-configure -w ${HC} --allow-newer=Cabal
79-
- "if [ \"$(uname)\" = \"Darwin\" ]; then cabal new-configure -w ${HC} --allow-newer=Cabal --constraint='gtk +have-quartz-gtk'; fi"
80-
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
81-
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
82-
- rm -rf .ghc.environment.* "."/dist
83-
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
84-
85-
# Here starts the actual work to be performed for the package under test;
86-
# any command which exits with a non-zero exit code causes the build to fail.
142+
- cat cabal.project || true
143+
- cat cabal.project.local || true
144+
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
145+
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
146+
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
147+
- rm cabal.project.freeze
148+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
149+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
87150
script:
88-
# test that source-distributions can be generated
89-
- (cd "." && cabal sdist)
90-
- mv "."/dist-newstyle/sdist/threadscope-*.tar.gz ${DISTDIR}/
151+
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
152+
# Packaging...
153+
- ${CABAL} v2-sdist all | color_cabal_output
154+
# Unpacking...
155+
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
91156
- cd ${DISTDIR} || false
92-
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
93-
- "printf 'packages: threadscope-*/*.cabal\\n' > cabal.project"
94-
- cat cabal.project
95-
- cabal new-configure -w ${HC} --allow-newer=Cabal
96-
- "if [ \"$(uname)\" = \"Darwin\" ]; then cabal new-configure -w ${HC} --allow-newer=Cabal --constraint='gtk +have-quartz-gtk'; fi"
157+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
158+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
159+
- PKGDIR_threadscope="$(find . -maxdepth 1 -type d -regex '.*/threadscope-[0-9.]*')"
160+
# Generate cabal.project
161+
- rm -rf cabal.project cabal.project.local cabal.project.freeze
162+
- touch cabal.project
163+
- |
164+
echo "packages: ${PKGDIR_threadscope}" >> cabal.project
165+
- |
166+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(threadscope)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
167+
- |
168+
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
169+
echo 'constraints: gtk +have-quartz-gtk' >> cabal.project
170+
echo 'allow-newer: Cabal, gtk-mac-integration:gtk' >> cabal.project
171+
fi
172+
- cat cabal.project || true
173+
- cat cabal.project.local || true
174+
# Building...
97175
# this builds all libraries and executables (without tests/benchmarks)
98-
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
99-
100-
# Build with installed constraints for packages in global-db
101-
- 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
102-
176+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
177+
# Building with tests and benchmarks...
103178
# build & run tests, build benchmarks
104-
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
179+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
180+
# cabal check...
181+
- (cd ${PKGDIR_threadscope} && ${CABAL} -vnormal check)
182+
# Building without installed constraints for packages in global-db...
183+
- rm -f cabal.project.local
184+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
105185

106-
# cabal check
107-
- (cd threadscope-* && cabal check)
108-
109-
# REGENDATA ["-o",".travis.yml","threadscope.cabal","libgtk2.0-dev","--osx=8.2.2"]
186+
# REGENDATA ("0.9.20191126",["threadscope.cabal","--apt","libgtk2.0-dev","--osx","8.6.5","--osx","8.8.1","--travis-patches",".travis/osx.patch","--travis-patches",".travis/deploy.patch","--travis-patches",".travis/allow-failrues.patch"])
187+
# EOF
110188

111189
before_deploy:
112190
- cp $(find dist-newstyle/ -type f -name threadscope -exec test -x {} \; -print) threadscope.$TRAVIS_OS_NAME
@@ -121,6 +199,4 @@ deploy:
121199
on:
122200
repo: haskell/ThreadScope
123201
tags: true
124-
condition: "$HC = ghc-8.2.2"
125-
126-
# EOF
202+
condition: "$HC = ghc-8.6.5"

‎.travis/deploy.patch‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/.travis.yml b/.travis.yml
2+
index d21f854..6443253 100644
3+
--- a/.travis.yml
4+
+++ b/.travis.yml
5+
@@ -145,3 +145,18 @@ script:
6+
7+
# REGENDATA ["travis","threadscope.cabal","--apt","libgtk2.0-dev","--osx","8.6.5"]
8+
# EOF
9+
+
10+
+before_deploy:
11+
+ - cp $(find dist-newstyle/ -type f -name threadscope -exec test -x {} \; -print) threadscope.$TRAVIS_OS_NAME
12+
+ - gzip -f threadscope.$TRAVIS_OS_NAME
13+
+
14+
+deploy:
15+
+ provider: releases
16+
+ api_key:
17+
+ secure: "CLdDbxzqQRTU6wMRqyMutoprbgr8o6fQfIYZc7DBkbRi1r6bOpJl/2Bmob6FYC1XhMsdeBhZfLy0a0MqcU4LNbToLtR8yKN+SvmfEUQn3novk69vfI5KipFqLLeduN4oHgGXSdjIdck3nF/ze8kB2ottJUNdp8J3UxAgMwS9AF8="
18+
+ file: threadscope.$TRAVIS_OS_NAME.gz
19+
+ skip_cleanup: true
20+
+ on:
21+
+ repo: haskell/ThreadScope
22+
+ tags: true
23+
+ condition: "$HC = ghc-8.6.5"

0 commit comments

Comments
 (0)