Merge branch 'hotfix/v0.7.0.1'

maoe · Jun 18, 2019 · c7322e7 · c7322e7
2 parents 41612e4 + bf0f167
commit c7322e7
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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