Skip to content

Commit 00de7e3

Browse files
author
Mitsutoshi Aoe
committed
Merge branch 'release/v0.6.1'
2 parents 201520b + b058598 commit 00de7e3

8 files changed

+580
-158
lines changed

‎.travis.yml

+144-28
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,147 @@
1-
addons:
2-
apt:
3-
packages:
4-
- libgmp-dev
5-
before_install:
6-
- |
7-
if test ! -f "$HOME/.local/bin/stack"
8-
then
9-
URL="https://www.stackage.org/stack/$TRAVIS_OS_NAME-x86_64"
10-
curl --location "$URL" > stack.tar.gz
11-
gunzip stack.tar.gz
12-
tar -x -f stack.tar --strip-components 1
13-
mkdir -p "$HOME/.local/bin"
14-
mv stack "$HOME/.local/bin/"
15-
fi
1+
# This Travis job script has been generated by a script via
2+
#
3+
# runghc make_travis_yml_2.hs '-o' '.travis.yml' '--osx=8.6.3' '--ghc-head' 'sensu-run.cabal' 'jq'
4+
#
5+
# For more information, see https://github.com/haskell-CI/haskell-ci
6+
#
7+
language: c
8+
sudo: false
9+
10+
git:
11+
submodules: false # whether to recursively clone submodules
12+
1613
cache:
1714
directories:
18-
- "$HOME/.local/bin"
19-
- "$HOME/.stack"
20-
language: c
21-
os:
22-
- linux
23-
- osx
15+
- $HOME/.cabal/packages
16+
- $HOME/.cabal/store
17+
- $HOME/.ghc-install
18+
19+
before_cache:
20+
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
21+
# 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:
31+
include:
32+
- compiler: "ghc-8.6.3"
33+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
34+
env: GITHUB_RELEASE=true HACKAGE_RELEASE=true
35+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3,jq], sources: [hvr-ghc]}}
36+
- compiler: "ghc-8.4.4"
37+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
38+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4,jq], sources: [hvr-ghc]}}
39+
- compiler: "ghc-8.2.2"
40+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
41+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2,jq], sources: [hvr-ghc]}}
42+
- compiler: "ghc-8.0.2"
43+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
44+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2,jq], sources: [hvr-ghc]}}
45+
- compiler: "ghc-head"
46+
env: GHCHEAD=true
47+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head,jq], sources: [hvr-ghc]}}
48+
- compiler: "ghc-8.6.3"
49+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
50+
env: GITHUB_RELEASE=true
51+
addons: {homebrew: {packages: [python@3, jq], update: true}}
52+
os: osx
53+
54+
allow_failures:
55+
- compiler: "ghc-head"
56+
57+
before_install:
58+
- HC=${CC}
59+
- HCPKG=${HC/ghc/ghc-pkg}
60+
- unset CC
61+
- ROOTDIR=$(pwd)
62+
- mkdir -p $HOME/.local/bin
63+
- "if [ \"$(uname)\" = \"Darwin\" ]; then 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"
64+
- "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"
65+
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
66+
- echo $HCNUMVER
67+
68+
install:
69+
- cabal --version
70+
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
71+
- BENCH=${BENCH---enable-benchmarks}
72+
- TEST=${TEST---enable-tests}
73+
- HADDOCK=${HADDOCK-true}
74+
- UNCONSTRAINED=${UNCONSTRAINED-true}
75+
- NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
76+
- GHCHEAD=${GHCHEAD-false}
77+
- travis_retry cabal update -v
78+
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
79+
- rm -fv cabal.project cabal.project.local
80+
# Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
81+
- |
82+
if $GHCHEAD; then
83+
sed -i 's/-- allow-newer: .*/allow-newer: *:base/' ${HOME}/.cabal/config
84+
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
85+
86+
echo 'repository head.hackage' >> ${HOME}/.cabal/config
87+
echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config
88+
echo ' secure: True' >> ${HOME}/.cabal/config
89+
echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config
90+
echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config
91+
echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config
92+
echo ' key-threshold: 3' >> ${HOME}/.cabal.config
93+
94+
grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
95+
96+
cabal new-update head.hackage -v
97+
fi
98+
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
99+
- "printf 'packages: \".\"\\n' > cabal.project"
100+
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
101+
- touch cabal.project.local
102+
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- sensu-run | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
103+
- cat cabal.project || true
104+
- cat cabal.project.local || true
105+
- if [ -f "./configure.ac" ]; then
106+
(cd "." && autoreconf -i);
107+
fi
108+
- rm -f cabal.project.freeze
109+
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
110+
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
111+
- rm -rf .ghc.environment.* "."/dist
112+
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
113+
114+
# Here starts the actual work to be performed for the package under test;
115+
# any command which exits with a non-zero exit code causes the build to fail.
24116
script:
25-
- stack setup
26-
- stack --no-terminal build --pedantic
27-
- stack --no-terminal install
28-
- stack sdist
29-
sudo: false
117+
# test that source-distributions can be generated
118+
- cabal new-sdist all
119+
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
120+
- cd ${DISTDIR} || false
121+
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
122+
- "printf 'packages: sensu-run-*/*.cabal\\n' > cabal.project"
123+
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
124+
- touch cabal.project.local
125+
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- sensu-run | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
126+
- cat cabal.project || true
127+
- cat cabal.project.local || true
128+
# this builds all libraries and executables (without tests/benchmarks)
129+
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
130+
131+
# build & run tests, build benchmarks
132+
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
133+
134+
# cabal check
135+
- (cd sensu-run-* && cabal check)
136+
137+
# Build without installed constraints for packages in global-db
138+
- 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
139+
140+
# REGENDATA ["-o",".travis.yml","--osx=ghc-8.6.3","--ghc-head","sensu-run.cabal"]
141+
30142
before_deploy:
31-
- cp $HOME/.local/bin/sensu-run sensu-run.$TRAVIS_OS_NAME
143+
- exe=$(jq -r '."install-plan" | .[] | select(."pkg-name" == "sensu-run") | ."bin-file"' < dist-newstyle/cache/plan.json)
144+
- cp "$exe" sensu-run.$TRAVIS_OS_NAME
32145
- gzip -f sensu-run.$TRAVIS_OS_NAME
33146
deploy:
34147
- provider: releases
@@ -39,11 +152,14 @@ deploy:
39152
on:
40153
repo: maoe/sensu-run
41154
tags: true
155+
condition: $GITHUB_RELEASE = true
42156
- provider: hackage
43157
username: MitsutoshiAoe
44158
password:
45159
secure: kH7EieRMx+9Sk7K+bo+rFnbZdJ6rlh6nFqCgLXFHTT4ofcvVvQ6bnSWdSleMG0chqElJ0jASqV9V2jpEb7yAoujJRJUbwHsP86A7qZLYkslDdJKLcc5mzuUbD8RqAhumb9BDZFXp+vGXWSaQBoqg9GSyTmsPGWT3GJLiZmEXELZHJMoaN7pEYoNUiCF6cd3Jz/WdXn7QqY9KicqtSeIsvJzy2JNsVwfJ++u2cLdtI+63hPWoCTWMHHIVf3/TLAFHCtYSkB8E2DtodMlqd4b46R4bTKqFiM/27txaizR5VuaPGfA3ygCBZMCP+yPrlhFtG7FOZnfvUiCFD2Q63Uw2MYBKpiTbl7jWoDsA1FHST7kfqEovAWducu4XVoXrcmjIa3cpg9N9eMsXHso/JYMyQQ9NqhbomHYwslIoK29gaLc6H4gyBAUxoVEB/ioko8ZbHqiAZzcxkkXLuewyG791LojdfMqGMEwISEE/KFlte3gJkZFLOYEXz+KSKO4v8MQmtn3cGqaTfa/D5r8NEBAF3vsxuKLRjd80YYqC1Gkp20wNEM+8faVea3U/y43+9ACwRo95l8GIkXl41VArpFNW9+nObsHtMvtYLxElH+hP6To2aHTTa1nWcRC99fopwRPF68VbHyxgrLD6oCN8zHA3SuQ6fx9O5n2zeH+lp+bKBBM=
46160
on:
47161
repo: maoe/sensu-run
48162
tags: true
49-
condition: $TRAVIS_OS_NAME = linux
163+
condition: $HACKAGE_RELEASE = true
164+
165+
# EOF

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Revision history for sensu-run
22

3+
## 0.6.1 -- 2018-12-13
4+
5+
* Fix the broken --timeout option
6+
* Add support for GHC 8.6
7+
38
## 0.6.0.3 -- 2018-11-06
49

510
* Relax upper version bound for base

‎cabal.project.freeze.ghc-8.0.2

+150
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
constraints: any.Cabal ==1.24.2.0,
2+
any.RSA ==2.3.0,
3+
any.SHA ==1.6.4.4,
4+
SHA -exe,
5+
any.StateVar ==1.1.1.1,
6+
any.adjunctions ==4.4,
7+
any.aeson ==1.4.2.0,
8+
aeson -bytestring-builder -cffi -developer -fast,
9+
any.ansi-terminal ==0.8.2,
10+
ansi-terminal -example,
11+
any.ansi-wl-pprint ==0.6.8.2,
12+
ansi-wl-pprint -example,
13+
any.array ==0.5.1.1,
14+
any.asn1-encoding ==0.9.5,
15+
any.asn1-parse ==0.9.4,
16+
any.asn1-types ==0.3.2,
17+
any.async ==2.2.1,
18+
async -bench,
19+
any.attoparsec ==0.13.2.2,
20+
attoparsec -developer,
21+
any.authenticate-oauth ==1.6,
22+
any.base ==4.9.1.0,
23+
any.base-compat ==0.10.5,
24+
any.base-orphans ==0.8,
25+
any.base16-bytestring ==0.1.1.6,
26+
any.base64-bytestring ==1.0.0.2,
27+
any.basement ==0.0.8,
28+
any.bifunctors ==5.5.3,
29+
bifunctors +semigroups +tagged,
30+
any.binary ==0.8.3.0,
31+
any.blaze-builder ==0.4.1.0,
32+
any.byteable ==0.1.1,
33+
any.bytestring ==0.10.8.1,
34+
any.cabal-doctest ==1.0.6,
35+
any.call-stack ==0.1.0,
36+
any.case-insensitive ==1.2.0.11,
37+
any.cereal ==0.5.7.0,
38+
cereal -bytestring-builder,
39+
any.colour ==2.3.4,
40+
any.comonad ==5.0.4,
41+
comonad +containers +contravariant +distributive +test-doctests,
42+
any.connection ==0.2.8,
43+
any.containers ==0.5.7.1,
44+
any.contravariant ==1.5,
45+
contravariant -safe +semigroups +statevar +tagged,
46+
any.cookie ==0.4.4,
47+
any.crypto-api ==0.13.3,
48+
crypto-api -all_cpolys,
49+
any.crypto-pubkey-types ==0.4.3,
50+
any.cryptonite ==0.25,
51+
cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse,
52+
any.data-default ==0.7.1.1,
53+
any.data-default-class ==0.1.2.0,
54+
any.data-default-instances-containers ==0.0.1,
55+
any.data-default-instances-dlist ==0.0.1,
56+
any.data-default-instances-old-locale ==0.0.1,
57+
any.deepseq ==1.4.2.0,
58+
any.directory ==1.3.0.0,
59+
any.distributive ==0.6,
60+
distributive +semigroups +tagged,
61+
any.dlist ==0.8.0.5,
62+
any.entropy ==0.4.1.4,
63+
entropy -halvm,
64+
any.exceptions ==0.10.0,
65+
any.filelock ==0.1.1.2,
66+
any.filepath ==1.4.1.1,
67+
any.free ==5.1,
68+
any.ghc-boot-th ==8.0.2,
69+
any.ghc-prim ==0.5.0.0,
70+
any.hashable ==1.2.7.0,
71+
hashable -examples +integer-gmp +sse2 -sse41,
72+
any.hourglass ==0.2.12,
73+
any.http-client ==0.5.14,
74+
http-client +network-uri,
75+
any.http-client-tls ==0.3.5.3,
76+
any.http-types ==0.12.2,
77+
any.integer-gmp ==1.0.0.1,
78+
any.integer-logarithms ==1.0.2.2,
79+
integer-logarithms -check-bounds +integer-gmp,
80+
any.invariant ==0.5.1,
81+
any.kan-extensions ==5.2,
82+
any.lens ==4.17,
83+
lens -benchmark-uniplate -dump-splices +inlining -j -old-inline-pragmas -safe +test-doctests +test-hunit +test-properties +test-templates +trustworthy,
84+
any.lens-aeson ==1.0.2,
85+
lens-aeson +test-doctests,
86+
any.memory ==0.14.18,
87+
memory +support_basement +support_bytestring +support_deepseq +support_foundation,
88+
any.mime-types ==0.1.0.8,
89+
any.mtl ==2.2.2,
90+
any.network ==2.8.0.0,
91+
any.network-uri ==2.6.1.0,
92+
any.old-locale ==1.0.0.7,
93+
any.optparse-applicative ==0.14.3.0,
94+
any.parallel ==3.2.2.0,
95+
any.parsec ==3.1.13.0,
96+
any.pem ==0.2.4,
97+
any.pretty ==1.1.3.3,
98+
any.primitive ==0.6.4.0,
99+
any.process ==1.4.3.0,
100+
any.profunctors ==5.3,
101+
any.psqueues ==0.2.7.0,
102+
any.random ==1.1,
103+
any.reflection ==2.1.4,
104+
reflection -slow +template-haskell,
105+
any.rts ==1.0,
106+
any.scientific ==0.3.6.2,
107+
scientific -bytestring-builder -integer-simple,
108+
any.semigroupoids ==5.3.1,
109+
semigroupoids +comonad +containers +contravariant +distributive +doctests +tagged +unordered-containers,
110+
any.semigroups ==0.18.5,
111+
semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +text +transformers +unordered-containers,
112+
any.socks ==0.5.6,
113+
any.stm ==2.5.0.0,
114+
any.streaming-commons ==0.2.1.0,
115+
streaming-commons -use-bytestring-builder,
116+
any.tagged ==0.8.6,
117+
tagged +deepseq +transformers,
118+
any.template-haskell ==2.11.1.0,
119+
any.temporary ==1.3,
120+
any.text ==1.2.3.1,
121+
text -bytestring-builder -developer -integer-simple,
122+
any.th-abstraction ==0.2.8.0,
123+
any.time ==1.6.0.1,
124+
any.time-locale-compat ==0.1.1.5,
125+
time-locale-compat -old-locale,
126+
any.tls ==1.4.1,
127+
tls +compat -hans +network,
128+
any.transformers ==0.5.2.0,
129+
any.transformers-base ==0.4.5.2,
130+
transformers-base +orphaninstances,
131+
any.transformers-compat ==0.6.2,
132+
transformers-compat +five -five-three -four +generic-deriving +mtl -three -two,
133+
any.unix ==2.7.2.1,
134+
any.unix-compat ==0.5.1,
135+
unix-compat -old-time,
136+
any.unordered-containers ==0.2.9.0,
137+
unordered-containers -debug,
138+
any.uuid-types ==1.0.3,
139+
any.vector ==0.12.0.2,
140+
vector +boundschecks -internalchecks -unsafechecks -wall,
141+
any.void ==0.7.2,
142+
void -safe,
143+
any.wreq ==0.5.3.1,
144+
wreq -aws -developer +doctest -httpbin,
145+
any.x509 ==1.7.5,
146+
any.x509-store ==1.6.7,
147+
any.x509-system ==1.6.6,
148+
any.x509-validation ==1.6.11,
149+
any.zlib ==0.6.2,
150+
zlib -non-blocking-ffi -pkg-config

0 commit comments

Comments
 (0)