From c373f5658098e667d5f93dc8cc017146f369c6c4 Mon Sep 17 00:00:00 2001 From: Piotr Stachyra Date: Fri, 5 Nov 2021 10:15:13 +0100 Subject: [PATCH 1/3] Bump to 1.1.2 --- bech32-th/ChangeLog.md | 4 ++++ bech32-th/bech32-th.cabal | 2 +- bech32/ChangeLog.md | 5 +++++ bech32/bech32.cabal | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bech32-th/ChangeLog.md b/bech32-th/ChangeLog.md index 6bf7ee4..c44eccd 100644 --- a/bech32-th/ChangeLog.md +++ b/bech32-th/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog for `bech32-th` +## [1.1.2] - 2021-11-05 + ++ Strip whitespaces from bech32 stdin to satisfy Windows `echo` command. + ## 1.1.1 -- 2021-06-11 + Upgraded CI to build with Cabal 3.4.0.0 and GHC 8.10.4. diff --git a/bech32-th/bech32-th.cabal b/bech32-th/bech32-th.cabal index e22389a..af64263 100644 --- a/bech32-th/bech32-th.cabal +++ b/bech32-th/bech32-th.cabal @@ -1,5 +1,5 @@ name: bech32-th -version: 1.1.1 +version: 1.1.2 synopsis: Template Haskell extensions to the Bech32 library. description: Template Haskell extensions to the Bech32 library, including quasi-quoters for compile-time checking of Bech32 string diff --git a/bech32/ChangeLog.md b/bech32/ChangeLog.md index d948acc..bdb77a8 100644 --- a/bech32/ChangeLog.md +++ b/bech32/ChangeLog.md @@ -1,6 +1,11 @@ # Changelog +## [1.1.2] - 2021-11-05 + +### Fixed + +- Strip whitespaces from bech32 stdin to satisfy Windows `echo` command. ## [1.1.1] - 2021-06-11 diff --git a/bech32/bech32.cabal b/bech32/bech32.cabal index fefd6ad..039c0ea 100644 --- a/bech32/bech32.cabal +++ b/bech32/bech32.cabal @@ -1,5 +1,5 @@ name: bech32 -version: 1.1.1 +version: 1.1.2 synopsis: Implementation of the Bech32 cryptocurrency address format (BIP 0173). description: Implementation of the Bech32 cryptocurrency address format documented in the BIP (Bitcoin Improvement Proposal) 0173. From 51155e4b5fa5a90180fb36912ff7bdc7917df210 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 5 Nov 2021 16:09:17 +0800 Subject: [PATCH 2/3] Move bech32-th back to 1.1.1, depend on bech32 1.1.2 --- bech32-th/ChangeLog.md | 4 ---- bech32-th/bech32-th.cabal | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bech32-th/ChangeLog.md b/bech32-th/ChangeLog.md index c44eccd..6bf7ee4 100644 --- a/bech32-th/ChangeLog.md +++ b/bech32-th/ChangeLog.md @@ -1,9 +1,5 @@ # ChangeLog for `bech32-th` -## [1.1.2] - 2021-11-05 - -+ Strip whitespaces from bech32 stdin to satisfy Windows `echo` command. - ## 1.1.1 -- 2021-06-11 + Upgraded CI to build with Cabal 3.4.0.0 and GHC 8.10.4. diff --git a/bech32-th/bech32-th.cabal b/bech32-th/bech32-th.cabal index af64263..287c438 100644 --- a/bech32-th/bech32-th.cabal +++ b/bech32-th/bech32-th.cabal @@ -1,5 +1,5 @@ name: bech32-th -version: 1.1.2 +version: 1.1.1 synopsis: Template Haskell extensions to the Bech32 library. description: Template Haskell extensions to the Bech32 library, including quasi-quoters for compile-time checking of Bech32 string @@ -37,7 +37,7 @@ library ghc-options: -Werror build-depends: base >= 4.11.1.0 && < 5 - , bech32 >= 1.1.1 + , bech32 >= 1.1.2 , template-haskell , text hs-source-dirs: From f627d07fe95b59fe992658f11a100cad45f5b49a Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 5 Nov 2021 17:49:03 +0800 Subject: [PATCH 3/3] Pin external repo versions in github actions build scripts --- .github/workflows/stack.yml | 2 +- .github/workflows/style.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml index a6caea0..9d8d23b 100644 --- a/.github/workflows/stack.yml +++ b/.github/workflows/stack.yml @@ -56,7 +56,7 @@ jobs: mkdir -p bin && cp $(stack path --local-install-root)/bin/* bin && chmod +x bin/* mkdir -p dist/haddock && mv $(stack path --local-install-root)/doc/* dist/haddock sed -i 's@href="[^"]*/doc/\([^"]*.html\)"@href="\1"@g' dist/haddock/index.html - wget -O Makefile https://raw.githubusercontent.com/input-output-hk/adrestia/master/.haskell/coverage/Makefile + wget -O Makefile https://raw.githubusercontent.com/input-output-hk/adrestia/7958e55b6a554f7514e2d29a92c144cc347cc91d/.haskell/coverage/Makefile mkdir -p .coverage && touch .coverage/template.overlay DESTDIR=dist/coverage make report && DESTDIR=dist/coverage make badge env: diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index b6f7e63..abfbcfb 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -20,8 +20,8 @@ jobs: - name: ✍ Check hlint and stylish run: | - curl -sSL https://raw.github.com/ndmitchell/hlint/master/misc/run.sh | sh -s . - curl -sSL https://raw.github.com/input-output-hk/adrestia/master/.haskell/stylish-haskell.sh | VERSION=v0.11.0.0 sh -s $(git ls-files '*.hs') -i + curl -sSL https://raw.github.com/ndmitchell/hlint/8e10b5143acf97fbdf9baff40ee2da93881e0bf8/misc/run.sh | sh -s . + curl -sSL https://raw.github.com/input-output-hk/adrestia/7958e55b6a554f7514e2d29a92c144cc347cc91d/.haskell/stylish-haskell.sh | VERSION=v0.11.0.0 sh -s $(git ls-files '*.hs') -i if [ -z "$(git status --porcelain)" ]; then echo "No style errors detected." else