Merge branch 'hotfix/v0.7.0.5'

maoe · Feb 10, 2020 · c2573ef · c2573ef
2 parents 56e2696 + ac8681a
commit c2573ef
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 52 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 # This Travis job script has been generated by a script via
 #
-#   haskell-ci 'sensu-run.cabal' '--ghc-head' '--osx=8.8.1' '--apt=jq' '--travis-patches=.travis/deploy.patch' '--travis-patches=.travis/osx.patch' '--travis-patches=.travis/releases.patch'
+#   haskell-ci 'sensu-run.cabal' '--ghc-head' '--osx=8.8.2' '--apt=jq' '--travis-patches=.travis/deploy.patch' '--travis-patches=.travis/releases.patch' '--travis-patches=.travis/osx.patch'
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.9.20191213
+# version: 0.9.20200125
 #
 version: ~> 1.0
 language: c
@@ -30,20 +30,20 @@ before_cache:
   - rm -rfv $CABALHOME/packages/head.hackage
 jobs:
   include:
-    - compiler: ghc-8.8.1
-      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","jq"]}}
+    - compiler: ghc-8.8.2
+      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.2","cabal-install-3.0","jq"]}}
       os: linux
+      env: GITHUB_RELEASE=true HACKAGE_RELEASE=true
     - compiler: ghc-8.6.5
       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","jq"]}}
       os: linux
-      env: GITHUB_RELEASE=true HACKAGE_RELEASE=true
     - compiler: ghc-8.4.4
       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","jq"]}}
       os: linux
     - compiler: ghc-head
       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-head","cabal-install-head","jq"]}}
       os: linux
-    - compiler: ghc-8.8.1
+    - compiler: ghc-8.8.2
       addons: {"homebrew":{"packages":["jq"]}}
       os: osx
       env: GITHUB_RELEASE=true
@@ -66,38 +66,27 @@ before_install:
   - echo $HCNUMVER
   - CABAL="$CABAL -vnormal+nowrap"
   - set -o pipefail
-install:
-  - ${CABAL} --version
-  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
   - TEST=--enable-tests
   - BENCH=--enable-benchmarks
   - HEADHACKAGE=false
-  - if [ $HCNUMVER -gt 80801 ] ; then HEADHACKAGE=true ; fi
+  - if [ $HCNUMVER -gt 80802 ] ; then HEADHACKAGE=true ; fi
   - rm -f $CABALHOME/config
   - |
-    echo "verbose: normal +nowrap +markoutput"                                  >> $CABALHOME/config
-    echo "remote-build-reporting: anonymous"                                    >> $CABALHOME/config
-    echo "write-ghc-environment-files: always"                                  >> $CABALHOME/config
-    echo "remote-repo-cache: $CABALHOME/packages"                               >> $CABALHOME/config
-    echo "logs-dir:          $CABALHOME/logs"                                   >> $CABALHOME/config
-    echo "world-file:        $CABALHOME/world"                                  >> $CABALHOME/config
-    echo "extra-prog-path:   $CABALHOME/bin"                                    >> $CABALHOME/config
-    echo "symlink-bindir:    $CABALHOME/bin"                                    >> $CABALHOME/config
-    echo "installdir:        $CABALHOME/bin"                                    >> $CABALHOME/config
-    echo "build-summary:     $CABALHOME/logs/build.log"                         >> $CABALHOME/config
-    echo "store-dir:         $CABALHOME/store"                                  >> $CABALHOME/config
-    echo "install-dirs user"                                                    >> $CABALHOME/config
-    echo "  prefix: $CABALHOME"                                                 >> $CABALHOME/config
-    echo "repository hackage.haskell.org"                                       >> $CABALHOME/config
-    echo "  url: http://hackage.haskell.org/"                                   >> $CABALHOME/config
-    echo "  secure: True"                                                       >> $CABALHOME/config
-    echo "  key-threshold: 3"                                                   >> $CABALHOME/config
-    echo "  root-keys:"                                                         >> $CABALHOME/config
-    echo "    fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >> $CABALHOME/config
-    echo "    1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >> $CABALHOME/config
-    echo "    2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >> $CABALHOME/config
-    echo "    0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >> $CABALHOME/config
-    echo "    51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >> $CABALHOME/config
+    echo "verbose: normal +nowrap +markoutput"          >> $CABALHOME/config
+    echo "remote-build-reporting: anonymous"            >> $CABALHOME/config
+    echo "write-ghc-environment-files: always"          >> $CABALHOME/config
+    echo "remote-repo-cache: $CABALHOME/packages"       >> $CABALHOME/config
+    echo "logs-dir:          $CABALHOME/logs"           >> $CABALHOME/config
+    echo "world-file:        $CABALHOME/world"          >> $CABALHOME/config
+    echo "extra-prog-path:   $CABALHOME/bin"            >> $CABALHOME/config
+    echo "symlink-bindir:    $CABALHOME/bin"            >> $CABALHOME/config
+    echo "installdir:        $CABALHOME/bin"            >> $CABALHOME/config
+    echo "build-summary:     $CABALHOME/logs/build.log" >> $CABALHOME/config
+    echo "store-dir:         $CABALHOME/store"          >> $CABALHOME/config
+    echo "install-dirs user"                            >> $CABALHOME/config
+    echo "  prefix: $CABALHOME"                         >> $CABALHOME/config
+    echo "repository hackage.haskell.org"               >> $CABALHOME/config
+    echo "  url: http://hackage.haskell.org/"           >> $CABALHOME/config
   - |
     if $HEADHACKAGE; then
     echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config
@@ -109,6 +98,9 @@ install:
     echo "              f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
     echo "   key-threshold: 3"                                                            >> $CABALHOME/config
     fi
+install:
+  - ${CABAL} --version
+  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
   - |
     echo "program-default-options"                >> $CABALHOME/config
     echo "  ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
@@ -161,7 +153,7 @@ script:
   - rm -f cabal.project.local
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
 
-# REGENDATA ("0.9.20191213",["sensu-run.cabal","--ghc-head","--osx=8.8.1","--apt=jq","--travis-patches=.travis/deploy.patch","--travis-patches=.travis/osx.patch","--travis-patches=.travis/releases.patch"])
+# REGENDATA ("0.9.20200125",["sensu-run.cabal","--ghc-head","--osx=8.8.2","--apt=jq","--travis-patches=.travis/deploy.patch","--travis-patches=.travis/releases.patch","--travis-patches=.travis/osx.patch"])
 # EOF
 
 before_deploy:

diff --git a/.travis/deploy.patch b/.travis/deploy.patch
@@ -4,7 +4,7 @@ index 16af3a5..ab4b9a1 100644
 +++ b/.travis.yml
 @@ -164,3 +164,26 @@ script:
 
- # REGENDATA ["travis","sensu-run.cabal","--ghc-head","--osx","8.8.1","--apt","jq"]
+ # REGENDATA ["travis","sensu-run.cabal","--ghc-head","--osx","8.8.2","--apt","jq"]
  # EOF
 +
 +before_deploy:

diff --git a/.travis/osx.patch b/.travis/osx.patch
@@ -1,16 +1,14 @@
-diff --git a/.travis.yml b/.travis.yml
-index 1ed9f1c..aac32ca 100644
 --- a/.travis.yml
 +++ b/.travis.yml
-@@ -42,7 +42,7 @@ matrix:
-       addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-head","cabal-install-head","jq"]}}
-       env: GHCHEAD=true
-     - compiler: ghc-8.8.1
--      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","jq"]}}
+@@ -44,7 +44,7 @@ jobs:
+       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-head","cabal-install-head","jq"]}}
+       os: linux
+     - compiler: ghc-8.8.2
+-      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.2","cabal-install-3.0","jq"]}}
 +      addons: {"homebrew":{"packages":["jq"]}}
        os: osx
+       env: GITHUB_RELEASE=true
    allow_failures:
-     - compiler: ghc-head
 @@ -60,7 +60,7 @@ before_install:
    - CABALHOME=$HOME/.cabal
    - export PATH="$CABALHOME/bin:$PATH"

diff --git a/.travis/releases.patch b/.travis/releases.patch
@@ -2,16 +2,16 @@ diff --git a/.travis.yml b/.travis.yml
 index 0001076..5ca88c0 100644
 --- a/.travis.yml
 +++ b/.travis.yml
-@@ -36,6 +36,7 @@ matrix:
-     - compiler: ghc-8.6.5
-       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","jq"]}}
+@@ -33,6 +33,7 @@ matrix:
+     - compiler: ghc-8.8.2
+       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.2","cabal-install-3.0","jq"]}}
        os: linux
 +      env: GITHUB_RELEASE=true HACKAGE_RELEASE=true
-     - compiler: ghc-8.4.4
-       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","jq"]}}
+     - compiler: ghc-8.6.5
+       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","jq"]}}
        os: linux
 @@ -45,6 +45,7 @@ matrix:
-     - compiler: ghc-8.8.1
+     - compiler: ghc-8.8.2
        addons: {"homebrew":{"packages":["jq"]}}
        os: osx
 +      env: GITHUB_RELEASE=true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Revision history for sensu-run
 
+## 0.7.0.5 -- 2020-02-10
+
+* Relax upper version bound for lens
+
 ## 0.7.0.4 -- 2019-01-07
 
 * Relax upper version bounds for base and lens

diff --git a/sensu-run.cabal b/sensu-run.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name: sensu-run
-version: 0.7.0.4
+version: 0.7.0.5
 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
@@ -20,7 +20,7 @@ extra-source-files:
 tested-with:
   GHC == 8.4.4
   GHC == 8.6.5
-  GHC == 8.8.1
+  GHC == 8.8.2
 
 executable sensu-run
   main-is: sensu-run.hs
@@ -35,7 +35,7 @@ executable sensu-run
     , http-client >= 0.5.6 && < 0.7
     , http-client-tls < 0.4
     , http-types >= 0.9.1 && < 0.13
-    , lens >= 4.15 && < 4.19
+    , lens >= 4.15 && < 4.20
     , network >= 2.2.3 && < 3.2
     , optparse-applicative >= 0.12 && < 0.16
     , process >= 1.6.3.0 && < 1.7