From adc9cf0c0b9f45e310662a271b588fbfeaf09060 Mon Sep 17 00:00:00 2001 From: Mitsutoshi Aoe Date: Tue, 18 Jun 2019 08:56:35 +0900 Subject: [PATCH 1/2] travis: Add missing GITHUB_RELEASE and HACKAGE_RELEASE env variables --- .travis.yml | 6 ++++-- .travis/releases.patch | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 .travis/releases.patch diff --git a/.travis.yml b/.travis.yml index 0001076..5f39f5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ # This Travis job script has been generated by a script via # -# haskell-ci 'sensu-run.cabal' '--ghc-head' '--osx=8.6.5' '--apt=jq' '--travis-patches=.travis/deploy.patch' '--travis-patches=.travis/osx.patch' +# haskell-ci 'sensu-run.cabal' '--ghc-head' '--osx=8.6.5' '--apt=jq' '--travis-patches=.travis/deploy.patch' '--travis-patches=.travis/osx.patch' '--travis-patches=.travis/releases.patch' # # For more information, see https://github.com/haskell-CI/haskell-ci # @@ -32,6 +32,7 @@ matrix: env: GHCHEAD=true - compiler: ghc-8.6.5 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4","jq"]}} + env: GITHUB_RELEASE=true HACKAGE_RELEASE=true - compiler: ghc-8.4.4 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4","jq"]}} - compiler: ghc-head @@ -40,6 +41,7 @@ matrix: - compiler: ghc-8.6.5 addons: {"homebrew":{"packages":["jq"]}} os: osx + env: GITHUB_RELEASE=true allow_failures: - compiler: ghc-head - compiler: ghc-8.8.1 @@ -158,7 +160,7 @@ script: - rm -f cabal.project.local - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output -# REGENDATA ["sensu-run.cabal","--ghc-head","--osx=8.6.5","--apt=jq","--travis-patches=.travis/deploy.patch","--travis-patches=.travis/osx.patch"] +# REGENDATA ["sensu-run.cabal","--ghc-head","--osx=8.6.5","--apt=jq","--travis-patches=.travis/deploy.patch","--travis-patches=.travis/osx.patch","--travis-patches=.travis/releases.patch"] # EOF before_deploy: diff --git a/.travis/releases.patch b/.travis/releases.patch new file mode 100644 index 0000000..55fb2b9 --- /dev/null +++ b/.travis/releases.patch @@ -0,0 +1,20 @@ +diff --git a/.travis.yml b/.travis.yml +index 0001076..5ca88c0 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -32,6 +32,7 @@ matrix: + env: GHCHEAD=true + - compiler: ghc-8.6.5 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4","jq"]}} ++ env: GITHUB_RELEASE=true HACKAGE_RELEASE=true + - compiler: ghc-8.4.4 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4","jq"]}} + - compiler: ghc-head +@@ -40,6 +41,7 @@ matrix: + - compiler: ghc-8.6.5 + addons: {"homebrew":{"packages":["jq"]}} + os: osx ++ env: GITHUB_RELEASE=true + allow_failures: + - compiler: ghc-head + - compiler: ghc-8.8.1 From bf0f167880374291b2dd78eb717f989ca0441a25 Mon Sep 17 00:00:00 2001 From: Mitsutoshi Aoe Date: Tue, 18 Jun 2019 14:07:43 +0900 Subject: [PATCH 2/2] Prepare for v0.7.0.1 --- CHANGELOG.md | 4 ++++ sensu-run.cabal | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b86665c..ab29129 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for sensu-run +## 0.7.0.1 -- 2019-06-18 + +* Minor fix to .travis.yml. No changes in Haskell code. + ## 0.7.0 -- 2019-06-17 * Handle signals and resend them to the monitored process (#27) diff --git a/sensu-run.cabal b/sensu-run.cabal index 7bbe78e..2569580 100644 --- a/sensu-run.cabal +++ b/sensu-run.cabal @@ -1,6 +1,7 @@ + cabal-version: 2.2 name: sensu-run -version: 0.7.0 +version: 0.7.0.1 synopsis: A tool to send command execution results to Sensu description: @sensu-run@ is a command line tool to send command execution results to Sensu