Skip to content

Commit

Permalink
Merge branch 'release/v0.6.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Mitsutoshi Aoe committed Dec 13, 2018
2 parents 201520b + b058598 commit 00de7e3
Show file tree
Hide file tree
Showing 8 changed files with 580 additions and 158 deletions.
172 changes: 144 additions & 28 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,147 @@
addons:
apt:
packages:
- libgmp-dev
before_install:
- |
if test ! -f "$HOME/.local/bin/stack"
then
URL="https://www.stackage.org/stack/$TRAVIS_OS_NAME-x86_64"
curl --location "$URL" > stack.tar.gz
gunzip stack.tar.gz
tar -x -f stack.tar --strip-components 1
mkdir -p "$HOME/.local/bin"
mv stack "$HOME/.local/bin/"
fi
# This Travis job script has been generated by a script via
#
# runghc make_travis_yml_2.hs '-o' '.travis.yml' '--osx=8.6.3' '--ghc-head' 'sensu-run.cabal' 'jq'
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
language: c
sudo: false

git:
submodules: false # whether to recursively clone submodules

cache:
directories:
- "$HOME/.local/bin"
- "$HOME/.stack"
language: c
os:
- linux
- osx
- $HOME/.cabal/packages
- $HOME/.cabal/store
- $HOME/.ghc-install

before_cache:
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
# remove files that are regenerated by 'cabal update'
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx

- rm -rfv $HOME/.cabal/packages/head.hackage

matrix:
include:
- compiler: "ghc-8.6.3"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
env: GITHUB_RELEASE=true HACKAGE_RELEASE=true
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3,jq], sources: [hvr-ghc]}}
- compiler: "ghc-8.4.4"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4,jq], sources: [hvr-ghc]}}
- compiler: "ghc-8.2.2"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2,jq], sources: [hvr-ghc]}}
- compiler: "ghc-8.0.2"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2,jq], sources: [hvr-ghc]}}
- compiler: "ghc-head"
env: GHCHEAD=true
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head,jq], sources: [hvr-ghc]}}
- compiler: "ghc-8.6.3"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
env: GITHUB_RELEASE=true
addons: {homebrew: {packages: [python@3, jq], update: true}}
os: osx

allow_failures:
- compiler: "ghc-head"

before_install:
- HC=${CC}
- HCPKG=${HC/ghc/ghc-pkg}
- unset CC
- ROOTDIR=$(pwd)
- mkdir -p $HOME/.local/bin
- "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"
- "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"
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
- echo $HCNUMVER

install:
- cabal --version
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
- BENCH=${BENCH---enable-benchmarks}
- TEST=${TEST---enable-tests}
- HADDOCK=${HADDOCK-true}
- UNCONSTRAINED=${UNCONSTRAINED-true}
- NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
- GHCHEAD=${GHCHEAD-false}
- travis_retry cabal update -v
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
- rm -fv cabal.project cabal.project.local
# Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
- |
if $GHCHEAD; then
sed -i 's/-- allow-newer: .*/allow-newer: *:base/' ${HOME}/.cabal/config
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
echo 'repository head.hackage' >> ${HOME}/.cabal/config
echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config
echo ' secure: True' >> ${HOME}/.cabal/config
echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config
echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config
echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config
echo ' key-threshold: 3' >> ${HOME}/.cabal.config
grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
cabal new-update head.hackage -v
fi
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
- "printf 'packages: \".\"\\n' > cabal.project"
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
- touch cabal.project.local
- "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"
- cat cabal.project || true
- cat cabal.project.local || true
- if [ -f "./configure.ac" ]; then
(cd "." && autoreconf -i);
fi
- rm -f cabal.project.freeze
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
- rm -rf .ghc.environment.* "."/dist
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

# Here starts the actual work to be performed for the package under test;
# any command which exits with a non-zero exit code causes the build to fail.
script:
- stack setup
- stack --no-terminal build --pedantic
- stack --no-terminal install
- stack sdist
sudo: false
# test that source-distributions can be generated
- cabal new-sdist all
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
- cd ${DISTDIR} || false
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
- "printf 'packages: sensu-run-*/*.cabal\\n' > cabal.project"
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
- touch cabal.project.local
- "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"
- cat cabal.project || true
- cat cabal.project.local || true
# this builds all libraries and executables (without tests/benchmarks)
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all

# build & run tests, build benchmarks
- cabal new-build -w ${HC} ${TEST} ${BENCH} all

# cabal check
- (cd sensu-run-* && cabal check)

# Build without installed constraints for packages in global-db
- 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

# REGENDATA ["-o",".travis.yml","--osx=ghc-8.6.3","--ghc-head","sensu-run.cabal"]

before_deploy:
- cp $HOME/.local/bin/sensu-run sensu-run.$TRAVIS_OS_NAME
- exe=$(jq -r '."install-plan" | .[] | select(."pkg-name" == "sensu-run") | ."bin-file"' < dist-newstyle/cache/plan.json)
- cp "$exe" sensu-run.$TRAVIS_OS_NAME
- gzip -f sensu-run.$TRAVIS_OS_NAME
deploy:
- provider: releases
Expand All @@ -39,11 +152,14 @@ deploy:
on:
repo: maoe/sensu-run
tags: true
condition: $GITHUB_RELEASE = true
- provider: hackage
username: MitsutoshiAoe
password:
secure: kH7EieRMx+9Sk7K+bo+rFnbZdJ6rlh6nFqCgLXFHTT4ofcvVvQ6bnSWdSleMG0chqElJ0jASqV9V2jpEb7yAoujJRJUbwHsP86A7qZLYkslDdJKLcc5mzuUbD8RqAhumb9BDZFXp+vGXWSaQBoqg9GSyTmsPGWT3GJLiZmEXELZHJMoaN7pEYoNUiCF6cd3Jz/WdXn7QqY9KicqtSeIsvJzy2JNsVwfJ++u2cLdtI+63hPWoCTWMHHIVf3/TLAFHCtYSkB8E2DtodMlqd4b46R4bTKqFiM/27txaizR5VuaPGfA3ygCBZMCP+yPrlhFtG7FOZnfvUiCFD2Q63Uw2MYBKpiTbl7jWoDsA1FHST7kfqEovAWducu4XVoXrcmjIa3cpg9N9eMsXHso/JYMyQQ9NqhbomHYwslIoK29gaLc6H4gyBAUxoVEB/ioko8ZbHqiAZzcxkkXLuewyG791LojdfMqGMEwISEE/KFlte3gJkZFLOYEXz+KSKO4v8MQmtn3cGqaTfa/D5r8NEBAF3vsxuKLRjd80YYqC1Gkp20wNEM+8faVea3U/y43+9ACwRo95l8GIkXl41VArpFNW9+nObsHtMvtYLxElH+hP6To2aHTTa1nWcRC99fopwRPF68VbHyxgrLD6oCN8zHA3SuQ6fx9O5n2zeH+lp+bKBBM=
on:
repo: maoe/sensu-run
tags: true
condition: $TRAVIS_OS_NAME = linux
condition: $HACKAGE_RELEASE = true

# EOF
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Revision history for sensu-run

## 0.6.1 -- 2018-12-13

* Fix the broken --timeout option
* Add support for GHC 8.6

## 0.6.0.3 -- 2018-11-06

* Relax upper version bound for base
Expand Down
150 changes: 150 additions & 0 deletions cabal.project.freeze.ghc-8.0.2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
constraints: any.Cabal ==1.24.2.0,
any.RSA ==2.3.0,
any.SHA ==1.6.4.4,
SHA -exe,
any.StateVar ==1.1.1.1,
any.adjunctions ==4.4,
any.aeson ==1.4.2.0,
aeson -bytestring-builder -cffi -developer -fast,
any.ansi-terminal ==0.8.2,
ansi-terminal -example,
any.ansi-wl-pprint ==0.6.8.2,
ansi-wl-pprint -example,
any.array ==0.5.1.1,
any.asn1-encoding ==0.9.5,
any.asn1-parse ==0.9.4,
any.asn1-types ==0.3.2,
any.async ==2.2.1,
async -bench,
any.attoparsec ==0.13.2.2,
attoparsec -developer,
any.authenticate-oauth ==1.6,
any.base ==4.9.1.0,
any.base-compat ==0.10.5,
any.base-orphans ==0.8,
any.base16-bytestring ==0.1.1.6,
any.base64-bytestring ==1.0.0.2,
any.basement ==0.0.8,
any.bifunctors ==5.5.3,
bifunctors +semigroups +tagged,
any.binary ==0.8.3.0,
any.blaze-builder ==0.4.1.0,
any.byteable ==0.1.1,
any.bytestring ==0.10.8.1,
any.cabal-doctest ==1.0.6,
any.call-stack ==0.1.0,
any.case-insensitive ==1.2.0.11,
any.cereal ==0.5.7.0,
cereal -bytestring-builder,
any.colour ==2.3.4,
any.comonad ==5.0.4,
comonad +containers +contravariant +distributive +test-doctests,
any.connection ==0.2.8,
any.containers ==0.5.7.1,
any.contravariant ==1.5,
contravariant -safe +semigroups +statevar +tagged,
any.cookie ==0.4.4,
any.crypto-api ==0.13.3,
crypto-api -all_cpolys,
any.crypto-pubkey-types ==0.4.3,
any.cryptonite ==0.25,
cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse,
any.data-default ==0.7.1.1,
any.data-default-class ==0.1.2.0,
any.data-default-instances-containers ==0.0.1,
any.data-default-instances-dlist ==0.0.1,
any.data-default-instances-old-locale ==0.0.1,
any.deepseq ==1.4.2.0,
any.directory ==1.3.0.0,
any.distributive ==0.6,
distributive +semigroups +tagged,
any.dlist ==0.8.0.5,
any.entropy ==0.4.1.4,
entropy -halvm,
any.exceptions ==0.10.0,
any.filelock ==0.1.1.2,
any.filepath ==1.4.1.1,
any.free ==5.1,
any.ghc-boot-th ==8.0.2,
any.ghc-prim ==0.5.0.0,
any.hashable ==1.2.7.0,
hashable -examples +integer-gmp +sse2 -sse41,
any.hourglass ==0.2.12,
any.http-client ==0.5.14,
http-client +network-uri,
any.http-client-tls ==0.3.5.3,
any.http-types ==0.12.2,
any.integer-gmp ==1.0.0.1,
any.integer-logarithms ==1.0.2.2,
integer-logarithms -check-bounds +integer-gmp,
any.invariant ==0.5.1,
any.kan-extensions ==5.2,
any.lens ==4.17,
lens -benchmark-uniplate -dump-splices +inlining -j -old-inline-pragmas -safe +test-doctests +test-hunit +test-properties +test-templates +trustworthy,
any.lens-aeson ==1.0.2,
lens-aeson +test-doctests,
any.memory ==0.14.18,
memory +support_basement +support_bytestring +support_deepseq +support_foundation,
any.mime-types ==0.1.0.8,
any.mtl ==2.2.2,
any.network ==2.8.0.0,
any.network-uri ==2.6.1.0,
any.old-locale ==1.0.0.7,
any.optparse-applicative ==0.14.3.0,
any.parallel ==3.2.2.0,
any.parsec ==3.1.13.0,
any.pem ==0.2.4,
any.pretty ==1.1.3.3,
any.primitive ==0.6.4.0,
any.process ==1.4.3.0,
any.profunctors ==5.3,
any.psqueues ==0.2.7.0,
any.random ==1.1,
any.reflection ==2.1.4,
reflection -slow +template-haskell,
any.rts ==1.0,
any.scientific ==0.3.6.2,
scientific -bytestring-builder -integer-simple,
any.semigroupoids ==5.3.1,
semigroupoids +comonad +containers +contravariant +distributive +doctests +tagged +unordered-containers,
any.semigroups ==0.18.5,
semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +text +transformers +unordered-containers,
any.socks ==0.5.6,
any.stm ==2.5.0.0,
any.streaming-commons ==0.2.1.0,
streaming-commons -use-bytestring-builder,
any.tagged ==0.8.6,
tagged +deepseq +transformers,
any.template-haskell ==2.11.1.0,
any.temporary ==1.3,
any.text ==1.2.3.1,
text -bytestring-builder -developer -integer-simple,
any.th-abstraction ==0.2.8.0,
any.time ==1.6.0.1,
any.time-locale-compat ==0.1.1.5,
time-locale-compat -old-locale,
any.tls ==1.4.1,
tls +compat -hans +network,
any.transformers ==0.5.2.0,
any.transformers-base ==0.4.5.2,
transformers-base +orphaninstances,
any.transformers-compat ==0.6.2,
transformers-compat +five -five-three -four +generic-deriving +mtl -three -two,
any.unix ==2.7.2.1,
any.unix-compat ==0.5.1,
unix-compat -old-time,
any.unordered-containers ==0.2.9.0,
unordered-containers -debug,
any.uuid-types ==1.0.3,
any.vector ==0.12.0.2,
vector +boundschecks -internalchecks -unsafechecks -wall,
any.void ==0.7.2,
void -safe,
any.wreq ==0.5.3.1,
wreq -aws -developer +doctest -httpbin,
any.x509 ==1.7.5,
any.x509-store ==1.6.7,
any.x509-system ==1.6.6,
any.x509-validation ==1.6.11,
any.zlib ==0.6.2,
zlib -non-blocking-ffi -pkg-config
Loading

0 comments on commit 00de7e3

Please sign in to comment.