From 014f5abd6e0d4432d4dafccc3489506c77f89daf Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Tue, 13 Oct 2020 08:39:07 +0000 Subject: [PATCH 1/5] Bump version from 2020.9.30 to 2020.10.13 --- lib/cli/cardano-wallet-cli.cabal | 2 +- .../cardano-wallet-core-integration.cabal | 2 +- lib/core/cardano-wallet-core.cabal | 2 +- lib/jormungandr/cardano-wallet-jormungandr.cabal | 2 +- lib/launcher/cardano-wallet-launcher.cabal | 2 +- lib/shelley/cardano-wallet.cabal | 2 +- lib/test-utils/cardano-wallet-test-utils.cabal | 2 +- lib/text-class/text-class.cabal | 2 +- nix/.stack.nix/cardano-wallet-cli.nix | 2 +- nix/.stack.nix/cardano-wallet-core-integration.nix | 2 +- nix/.stack.nix/cardano-wallet-core.nix | 2 +- nix/.stack.nix/cardano-wallet-jormungandr.nix | 2 +- nix/.stack.nix/cardano-wallet-launcher.nix | 2 +- nix/.stack.nix/cardano-wallet-test-utils.nix | 2 +- nix/.stack.nix/cardano-wallet.nix | 2 +- nix/.stack.nix/text-class.nix | 2 +- scripts/make_release.sh | 10 +++++----- specifications/api/swagger.yaml | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/cli/cardano-wallet-cli.cabal b/lib/cli/cardano-wallet-cli.cabal index b0201a8a7eb..4bd301d00db 100644 --- a/lib/cli/cardano-wallet-cli.cabal +++ b/lib/cli/cardano-wallet-cli.cabal @@ -1,5 +1,5 @@ name: cardano-wallet-cli -version: 2020.9.30 +version: 2020.10.13 synopsis: Utilities for a building Command-Line Interfaces homepage: https://github.com/input-output-hk/cardano-wallet author: IOHK Engineering Team diff --git a/lib/core-integration/cardano-wallet-core-integration.cabal b/lib/core-integration/cardano-wallet-core-integration.cabal index c3dbba38647..960f459180e 100644 --- a/lib/core-integration/cardano-wallet-core-integration.cabal +++ b/lib/core-integration/cardano-wallet-core-integration.cabal @@ -1,5 +1,5 @@ name: cardano-wallet-core-integration -version: 2020.9.30 +version: 2020.10.13 synopsis: Core integration test library. description: Shared core functionality for our integration test suites. homepage: https://github.com/input-output-hk/cardano-wallet diff --git a/lib/core/cardano-wallet-core.cabal b/lib/core/cardano-wallet-core.cabal index e592bb2f908..cc590e379eb 100644 --- a/lib/core/cardano-wallet-core.cabal +++ b/lib/core/cardano-wallet-core.cabal @@ -1,5 +1,5 @@ name: cardano-wallet-core -version: 2020.9.30 +version: 2020.10.13 synopsis: The Wallet Backend for a Cardano node. description: Please see README.md homepage: https://github.com/input-output-hk/cardano-wallet diff --git a/lib/jormungandr/cardano-wallet-jormungandr.cabal b/lib/jormungandr/cardano-wallet-jormungandr.cabal index 5b11ccf8b78..75174949050 100644 --- a/lib/jormungandr/cardano-wallet-jormungandr.cabal +++ b/lib/jormungandr/cardano-wallet-jormungandr.cabal @@ -1,5 +1,5 @@ name: cardano-wallet-jormungandr -version: 2020.9.30 +version: 2020.10.13 synopsis: Wallet backend protocol-specific bits implemented using Jörmungandr description: Please see README.md homepage: https://github.com/input-output-hk/cardano-wallet diff --git a/lib/launcher/cardano-wallet-launcher.cabal b/lib/launcher/cardano-wallet-launcher.cabal index 87367eaf5bc..82ed673c203 100644 --- a/lib/launcher/cardano-wallet-launcher.cabal +++ b/lib/launcher/cardano-wallet-launcher.cabal @@ -1,5 +1,5 @@ name: cardano-wallet-launcher -version: 2020.9.30 +version: 2020.10.13 synopsis: Utilities for a building commands launcher homepage: https://github.com/input-output-hk/cardano-wallet author: IOHK Engineering Team diff --git a/lib/shelley/cardano-wallet.cabal b/lib/shelley/cardano-wallet.cabal index 6925f63b41c..9859983cefc 100644 --- a/lib/shelley/cardano-wallet.cabal +++ b/lib/shelley/cardano-wallet.cabal @@ -1,5 +1,5 @@ name: cardano-wallet -version: 2020.9.30 +version: 2020.10.13 synopsis: Wallet backend protocol-specific bits implemented using Shelley nodes description: Please see README.md homepage: https://github.com/input-output-hk/cardano-wallet diff --git a/lib/test-utils/cardano-wallet-test-utils.cabal b/lib/test-utils/cardano-wallet-test-utils.cabal index 2fc9728153e..4f949ef7cb3 100644 --- a/lib/test-utils/cardano-wallet-test-utils.cabal +++ b/lib/test-utils/cardano-wallet-test-utils.cabal @@ -1,5 +1,5 @@ name: cardano-wallet-test-utils -version: 2020.9.30 +version: 2020.10.13 synopsis: Shared utilities for writing unit and property tests. description: Shared utilities for writing unit and property tests. homepage: https://github.com/input-output-hk/cardano-wallet diff --git a/lib/text-class/text-class.cabal b/lib/text-class/text-class.cabal index 5c45ea435e0..1b78ee5a9ef 100644 --- a/lib/text-class/text-class.cabal +++ b/lib/text-class/text-class.cabal @@ -1,5 +1,5 @@ name: text-class -version: 2020.9.30 +version: 2020.10.13 synopsis: Extra helpers to convert data-types to and from Text homepage: https://github.com/input-output-hk/cardano-wallet author: IOHK Engineering Team diff --git a/nix/.stack.nix/cardano-wallet-cli.nix b/nix/.stack.nix/cardano-wallet-cli.nix index 38bbd412983..a075b42fdad 100644 --- a/nix/.stack.nix/cardano-wallet-cli.nix +++ b/nix/.stack.nix/cardano-wallet-cli.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet-cli"; version = "2020.9.30"; }; + identifier = { name = "cardano-wallet-cli"; version = "2020.10.13"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; diff --git a/nix/.stack.nix/cardano-wallet-core-integration.nix b/nix/.stack.nix/cardano-wallet-core-integration.nix index eea298c0f13..de4c511f388 100644 --- a/nix/.stack.nix/cardano-wallet-core-integration.nix +++ b/nix/.stack.nix/cardano-wallet-core-integration.nix @@ -13,7 +13,7 @@ specVersion = "1.10"; identifier = { name = "cardano-wallet-core-integration"; - version = "2020.9.30"; + version = "2020.10.13"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; diff --git a/nix/.stack.nix/cardano-wallet-core.nix b/nix/.stack.nix/cardano-wallet-core.nix index be71a29df77..73a7a4a37e4 100644 --- a/nix/.stack.nix/cardano-wallet-core.nix +++ b/nix/.stack.nix/cardano-wallet-core.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet-core"; version = "2020.9.30"; }; + identifier = { name = "cardano-wallet-core"; version = "2020.10.13"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; diff --git a/nix/.stack.nix/cardano-wallet-jormungandr.nix b/nix/.stack.nix/cardano-wallet-jormungandr.nix index 2cca815cf79..464d86eb689 100644 --- a/nix/.stack.nix/cardano-wallet-jormungandr.nix +++ b/nix/.stack.nix/cardano-wallet-jormungandr.nix @@ -13,7 +13,7 @@ specVersion = "1.10"; identifier = { name = "cardano-wallet-jormungandr"; - version = "2020.9.30"; + version = "2020.10.13"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; diff --git a/nix/.stack.nix/cardano-wallet-launcher.nix b/nix/.stack.nix/cardano-wallet-launcher.nix index 060b9e3847e..52b3b10720c 100644 --- a/nix/.stack.nix/cardano-wallet-launcher.nix +++ b/nix/.stack.nix/cardano-wallet-launcher.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet-launcher"; version = "2020.9.30"; }; + identifier = { name = "cardano-wallet-launcher"; version = "2020.10.13"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; diff --git a/nix/.stack.nix/cardano-wallet-test-utils.nix b/nix/.stack.nix/cardano-wallet-test-utils.nix index e81566aeb03..56ea40d81c5 100644 --- a/nix/.stack.nix/cardano-wallet-test-utils.nix +++ b/nix/.stack.nix/cardano-wallet-test-utils.nix @@ -13,7 +13,7 @@ specVersion = "1.10"; identifier = { name = "cardano-wallet-test-utils"; - version = "2020.9.30"; + version = "2020.10.13"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; diff --git a/nix/.stack.nix/cardano-wallet.nix b/nix/.stack.nix/cardano-wallet.nix index 340fe70f2e8..58296e5cc7b 100644 --- a/nix/.stack.nix/cardano-wallet.nix +++ b/nix/.stack.nix/cardano-wallet.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet"; version = "2020.9.30"; }; + identifier = { name = "cardano-wallet"; version = "2020.10.13"; }; license = "Apache-2.0"; copyright = "2020 IOHK"; maintainer = "operations@iohk.io"; diff --git a/nix/.stack.nix/text-class.nix b/nix/.stack.nix/text-class.nix index c5808c85f9c..160eac2b429 100644 --- a/nix/.stack.nix/text-class.nix +++ b/nix/.stack.nix/text-class.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "text-class"; version = "2020.9.30"; }; + identifier = { name = "text-class"; version = "2020.10.13"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; diff --git a/scripts/make_release.sh b/scripts/make_release.sh index 20424191ba0..834e1c042aa 100755 --- a/scripts/make_release.sh +++ b/scripts/make_release.sh @@ -17,14 +17,14 @@ set -euo pipefail ################################################################################ # Release-specific parameters (Change when you bump the version) -OLD_GIT_TAG="v2020-09-22" -OLD_CABAL_VERSION="2020.9.22" +OLD_GIT_TAG="v2020-09-30" +OLD_CABAL_VERSION="2020.9.30" -GIT_TAG="v2020-09-30" -CABAL_VERSION="2020.9.30" +GIT_TAG="v2020-10-13" +CABAL_VERSION="2020.10.13" JORM_TAG="v0.9.0" -CARDANO_NODE_TAG="1.20.0" +CARDANO_NODE_TAG="1.21.1" ################################################################################ OLD_DATE="${OLD_GIT_TAG//v}" CHANGELOG=GENERATED_CHANGELOG.md diff --git a/specifications/api/swagger.yaml b/specifications/api/swagger.yaml index 69784dddefc..54bc83f84a9 100644 --- a/specifications/api/swagger.yaml +++ b/specifications/api/swagger.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: Cardano Wallet Backend API - version: 2020.9.30 + version: 2020.10.13 license: name: Apache-2.0 url: https://raw.githubusercontent.com/input-output-hk/cardano-wallet/master/LICENSE From 993b5291861c676715660f2b1f515629d039a914 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 12 Oct 2020 20:06:40 +0200 Subject: [PATCH 2/5] Fix extra-source-files not containing files used by TH We include swagger.yaml via file-embed TH function into to source code. Cabal needs a way to know that this file is used by the build process, so it can invalidate the cache and rebuild the source file calling file-embed whenever swagger.yaml changes. --- lib/core/cardano-wallet-core.cabal | 1 + lib/core/specifications | 1 + lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs | 2 +- lib/jormungandr/cardano-wallet-jormungandr.cabal | 1 + lib/jormungandr/specifications | 1 + lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/ApiSpec.hs | 2 +- 6 files changed, 6 insertions(+), 2 deletions(-) create mode 120000 lib/core/specifications create mode 120000 lib/jormungandr/specifications diff --git a/lib/core/cardano-wallet-core.cabal b/lib/core/cardano-wallet-core.cabal index e592bb2f908..ffb79b3b715 100644 --- a/lib/core/cardano-wallet-core.cabal +++ b/lib/core/cardano-wallet-core.cabal @@ -10,6 +10,7 @@ license: Apache-2.0 category: Web build-type: Simple extra-source-files: README.md + specifications/api/swagger.yaml cabal-version: >=1.10 flag release diff --git a/lib/core/specifications b/lib/core/specifications new file mode 120000 index 00000000000..77e674e2051 --- /dev/null +++ b/lib/core/specifications @@ -0,0 +1 @@ +../../specifications/ \ No newline at end of file diff --git a/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs b/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs index 12a9e39c603..aeaa469f6cf 100644 --- a/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs +++ b/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs @@ -1540,7 +1540,7 @@ specification = unsafeDecode bytes where bytes = $( - let swaggerYaml = "../../specifications/api/swagger.yaml" + let swaggerYaml = "./specifications/api/swagger.yaml" in liftIO (lookupEnv "SWAGGER_YAML") >>= maybe (makeRelativeToProject swaggerYaml) pure >>= embedFile diff --git a/lib/jormungandr/cardano-wallet-jormungandr.cabal b/lib/jormungandr/cardano-wallet-jormungandr.cabal index 5b11ccf8b78..2884ee2a179 100644 --- a/lib/jormungandr/cardano-wallet-jormungandr.cabal +++ b/lib/jormungandr/cardano-wallet-jormungandr.cabal @@ -10,6 +10,7 @@ license: Apache-2.0 category: Web build-type: Simple extra-source-files: README.md + specifications/api/swagger.yaml cabal-version: >=1.10 flag release diff --git a/lib/jormungandr/specifications b/lib/jormungandr/specifications new file mode 120000 index 00000000000..77e674e2051 --- /dev/null +++ b/lib/jormungandr/specifications @@ -0,0 +1 @@ +../../specifications/ \ No newline at end of file diff --git a/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/ApiSpec.hs b/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/ApiSpec.hs index 2ae824a3c68..ecde489c2f6 100644 --- a/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/ApiSpec.hs +++ b/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/ApiSpec.hs @@ -221,7 +221,7 @@ specification = unsafeDecode bytes where bytes = $( - let swaggerYaml = "../../specifications/api/swagger.yaml" + let swaggerYaml = "./specifications/api/swagger.yaml" in liftIO (lookupEnv "SWAGGER_YAML") >>= maybe (makeRelativeToProject swaggerYaml) pure >>= embedFile From 48b87b1f8d1dc2e0aecdf064c115fe105bbeef28 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Tue, 13 Oct 2020 08:38:01 +1000 Subject: [PATCH 3/5] Symlinks don't need a trailing slash --- lib/core/specifications | 2 +- lib/jormungandr/specifications | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/core/specifications b/lib/core/specifications index 77e674e2051..5b378857ca6 120000 --- a/lib/core/specifications +++ b/lib/core/specifications @@ -1 +1 @@ -../../specifications/ \ No newline at end of file +../../specifications \ No newline at end of file diff --git a/lib/jormungandr/specifications b/lib/jormungandr/specifications index 77e674e2051..5b378857ca6 120000 --- a/lib/jormungandr/specifications +++ b/lib/jormungandr/specifications @@ -1 +1 @@ -../../specifications/ \ No newline at end of file +../../specifications \ No newline at end of file From 6624d658c3ed469bc8a4150071cbefdd6c6dbfca Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Tue, 13 Oct 2020 08:46:23 +1000 Subject: [PATCH 4/5] Remove unnecessary file lib/core/README.md --- lib/core/README.md | 1 - lib/core/cardano-wallet-core.cabal | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 lib/core/README.md diff --git a/lib/core/README.md b/lib/core/README.md deleted file mode 100644 index d6a13f12c13..00000000000 --- a/lib/core/README.md +++ /dev/null @@ -1 +0,0 @@ -# Cardano Wallet Core diff --git a/lib/core/cardano-wallet-core.cabal b/lib/core/cardano-wallet-core.cabal index ffb79b3b715..4817b043c8e 100644 --- a/lib/core/cardano-wallet-core.cabal +++ b/lib/core/cardano-wallet-core.cabal @@ -9,8 +9,7 @@ copyright: 2018-2020 IOHK license: Apache-2.0 category: Web build-type: Simple -extra-source-files: README.md - specifications/api/swagger.yaml +extra-source-files: specifications/api/swagger.yaml cabal-version: >=1.10 flag release From 18e13054b9dfd98f55585870bc856593c1eb0d3c Mon Sep 17 00:00:00 2001 From: IOHK Date: Tue, 13 Oct 2020 09:42:10 +0000 Subject: [PATCH 5/5] Regenerate nix --- nix/.stack.nix/cardano-wallet-cli.nix | 2 +- nix/.stack.nix/cardano-wallet-launcher.nix | 5 ++++- nix/.stack.nix/cardano-wallet.nix | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nix/.stack.nix/cardano-wallet-cli.nix b/nix/.stack.nix/cardano-wallet-cli.nix index a075b42fdad..f6b34cb8137 100644 --- a/nix/.stack.nix/cardano-wallet-cli.nix +++ b/nix/.stack.nix/cardano-wallet-cli.nix @@ -70,4 +70,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault ../.././lib/cli; } + } // rec { src = (pkgs.lib).mkDefault ../.././lib/cli; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-wallet-launcher.nix b/nix/.stack.nix/cardano-wallet-launcher.nix index 52b3b10720c..56f0d1a4783 100644 --- a/nix/.stack.nix/cardano-wallet-launcher.nix +++ b/nix/.stack.nix/cardano-wallet-launcher.nix @@ -11,7 +11,10 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet-launcher"; version = "2020.10.13"; }; + identifier = { + name = "cardano-wallet-launcher"; + version = "2020.10.13"; + }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; diff --git a/nix/.stack.nix/cardano-wallet.nix b/nix/.stack.nix/cardano-wallet.nix index 58296e5cc7b..483d54af02f 100644 --- a/nix/.stack.nix/cardano-wallet.nix +++ b/nix/.stack.nix/cardano-wallet.nix @@ -226,4 +226,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault ../.././lib/shelley; } + } // rec { src = (pkgs.lib).mkDefault ../.././lib/shelley; } \ No newline at end of file