From 200f07e7ae1af8f2853f817b48c65734e365bf2c Mon Sep 17 00:00:00 2001 From: Piotr Stachyra Date: Tue, 21 Jun 2022 11:07:45 +0200 Subject: [PATCH 1/3] Update changelog --- ChangeLog.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 01b418094..d7a961ba2 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,9 @@ +## [3.11.0] - 2022-06-21 + +### Added + +- Compatibility with Aeson 2 library. + ## [3.10.0] - 2022-05-26 ### Added From 74827792e96cdc2ab8ff0a1950c451cdb679929d Mon Sep 17 00:00:00 2001 From: Piotr Stachyra Date: Tue, 21 Jun 2022 11:11:10 +0200 Subject: [PATCH 2/3] Bump to 3.11.0 --- command-line/cardano-addresses-cli.cabal | 6 +++--- command-line/package.yaml | 2 +- core/cardano-addresses.cabal | 6 +++--- core/package.yaml | 2 +- jsapi/cardano-addresses-jsapi.cabal | 2 +- jsapi/package-lock.json | 2 +- jsapi/package.json | 2 +- jsbits/cardano-addresses-jsbits.cabal | 6 +++--- jsbits/package.yaml | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/command-line/cardano-addresses-cli.cabal b/command-line/cardano-addresses-cli.cabal index b4f8389d4..d970284f5 100644 --- a/command-line/cardano-addresses-cli.cabal +++ b/command-line/cardano-addresses-cli.cabal @@ -1,13 +1,13 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.7. +-- This file has been generated from package.yaml by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack -- --- hash: cef07e7a8f26edc0bd537bd1c628f023e8e5c6c251b2f3da50caa85026ada448 +-- hash: 07407dda09a83c5847a8fe316831183837efd430420245d2fca610efa1a94430 name: cardano-addresses-cli -version: 3.10.0 +version: 3.11.0 synopsis: Utils for constructing a command-line on top of cardano-addresses. description: Please see the README on GitHub at category: Cardano diff --git a/command-line/package.yaml b/command-line/package.yaml index 5f23d5481..6cc98a032 100644 --- a/command-line/package.yaml +++ b/command-line/package.yaml @@ -1,5 +1,5 @@ name: cardano-addresses-cli -version: 3.10.0 +version: 3.11.0 github: input-output-hk/cardano-addresses license: Apache-2.0 author: IOHK diff --git a/core/cardano-addresses.cabal b/core/cardano-addresses.cabal index 853500976..df3c2b8f6 100644 --- a/core/cardano-addresses.cabal +++ b/core/cardano-addresses.cabal @@ -1,13 +1,13 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.7. +-- This file has been generated from package.yaml by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack -- --- hash: 71777847181ac1ed3a185c266d10fd57f8a0262f63c0976da3b9d6526f923038 +-- hash: 86912f19e7dacb4916632c2b25bddeb51e1cb689da8f470f34d816a275895da3 name: cardano-addresses -version: 3.10.0 +version: 3.11.0 synopsis: Library utilities for mnemonic generation and address derivation. description: Please see the README on GitHub at category: Cardano diff --git a/core/package.yaml b/core/package.yaml index 0adb0bdae..ece453ce3 100644 --- a/core/package.yaml +++ b/core/package.yaml @@ -1,5 +1,5 @@ name: cardano-addresses -version: 3.10.0 +version: 3.11.0 github: input-output-hk/cardano-addresses license: Apache-2.0 author: IOHK diff --git a/jsapi/cardano-addresses-jsapi.cabal b/jsapi/cardano-addresses-jsapi.cabal index e99f5e92b..be2861ab4 100644 --- a/jsapi/cardano-addresses-jsapi.cabal +++ b/jsapi/cardano-addresses-jsapi.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: cardano-addresses-jsapi -version: 3.10.0 +version: 3.11.0 synopsis: Javascript FFI for cardano-addresses. description: This package provides functions callable from Javascript on top of which a TypeScript API can be built. It uses the cardano-addresses-ghcjs diff --git a/jsapi/package-lock.json b/jsapi/package-lock.json index de94f0a94..222a2f9c3 100644 --- a/jsapi/package-lock.json +++ b/jsapi/package-lock.json @@ -1,6 +1,6 @@ { "name": "cardano-addresses", - "version": "3.10.0", + "version": "3.11.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/jsapi/package.json b/jsapi/package.json index de7299ca1..37703ba7c 100644 --- a/jsapi/package.json +++ b/jsapi/package.json @@ -1,5 +1,5 @@ { - "version": "3.10.0", + "version": "3.11.0", "license": "Apache-2.0", "main": "dist/index.js", "typings": "dist/index.d.ts", diff --git a/jsbits/cardano-addresses-jsbits.cabal b/jsbits/cardano-addresses-jsbits.cabal index 31e2fb6e6..3967e1794 100644 --- a/jsbits/cardano-addresses-jsbits.cabal +++ b/jsbits/cardano-addresses-jsbits.cabal @@ -1,13 +1,13 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.7. +-- This file has been generated from package.yaml by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack -- --- hash: 2f50e2556a90c73fc40dc2be6ca4ddc5845e10be0b7c7583b69a7002677fc55d +-- hash: a442cb827a84812d40a409784949793efa93be36e66bf288238e220660337bc0 name: cardano-addresses-jsbits -version: 3.10.0 +version: 3.11.0 synopsis: Javascript code for ghcjs build of cardano-addresses. description: This package supports ghcjs compilation of cardano-addresses with Javascript wrappers and Emscripten builds of the cryptonite C diff --git a/jsbits/package.yaml b/jsbits/package.yaml index b4d1262d6..d46e16c42 100644 --- a/jsbits/package.yaml +++ b/jsbits/package.yaml @@ -1,5 +1,5 @@ name: cardano-addresses-jsbits -version: 3.10.0 +version: 3.11.0 github: input-output-hk/cardano-addresses license: Apache-2.0 author: IOHK From b18771e62c1ebdc8cccb5f895b7151f5b0f12730 Mon Sep 17 00:00:00 2001 From: Piotr Stachyra Date: Tue, 21 Jun 2022 11:29:33 +0200 Subject: [PATCH 3/3] update haskell.yml flow with push to master branch instead of main --- .github/workflows/haskell.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index ff4248e2c..169c87a9e 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -6,8 +6,7 @@ defaults: on: push: - branches: - - main + branches: [ "master" ] pull_request: jobs: