Skip to content

Commit

Permalink
Merge #2623 #2626
Browse files Browse the repository at this point in the history
2623: e2e tests: fix docker workflow r=rvl a=piotr-iohk


# Issue Number

<!-- Put here a reference to the issue that this PR relates to and which requirements it tackles. Jira issues of the form ADP- will be auto-linked. -->


# Overview

<!-- Detail in a few bullet points the work accomplished in this PR -->

- [ ] I have added a step for docker workflow to get the latest cardano-wallet bundle before starting tests in order to have cardano-address on the path which is required for recently added e2e shared wallet tests


# Comments
This was slight omission from #2619. Other workflows already have it by default.

Tested here on the docker workflow -> https://github.com/input-output-hk/cardano-wallet/actions/runs/784885875


2626: Bump version from 2021-04-08 to 2021-04-28 r=rvl a=rvl



Co-authored-by: Piotr Stachyra <piotr.stachyra@iohk.io>
Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
  • Loading branch information
3 people committed Apr 28, 2021
3 parents 1ab90cd + 73a690f + e40d7d1 commit 1d37426
Show file tree
Hide file tree
Showing 19 changed files with 22 additions and 21 deletions.
1 change: 1 addition & 0 deletions .github/workflows/e2e-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
run: |
rake fixture_wallets_decode
rake get_latest_configs["testnet"]
rake get_latest_bins
- name: Cache node db
id: cache
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ See **Installation Instructions** for each available [release](https://github.co
> | cardano-wallet | cardano-node (compatible versions) | SMASH (compatible versions)
> | --- | --- | ---
> | `master` branch | [1.26.2](https://github.com/input-output-hk/cardano-node/releases/tag/1.26.2) | [1.3.0](https://github.com/input-output-hk/smash/releases/tag/1.3.0)
> | [v2021-04-28](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2021-04-28) | [1.26.2](https://github.com/input-output-hk/cardano-node/releases/tag/1.26.2) | [1.3.0](https://github.com/input-output-hk/smash/releases/tag/1.3.0)
> | [v2021-04-08](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2021-04-08) | [1.25.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.25.1) | [1.3.0](https://github.com/input-output-hk/smash/releases/tag/1.3.0)
> | [v2021-03-04](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2021-03-04) | [1.25.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.25.1) | [1.3.0](https://github.com/input-output-hk/smash/releases/tag/1.3.0)
> | [v2021-02-15](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2021-02-15) | [1.25.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.25.1) | [1.3.0](https://github.com/input-output-hk/smash/releases/tag/1.3.0)
## How to build from sources

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.5"

services:
cardano-node:
image: inputoutput/cardano-node:1.25.1
image: inputoutput/cardano-node:1.26.2
environment:
NETWORK:
volumes:
Expand All @@ -18,7 +18,7 @@ services:
max-size: "50m"

cardano-wallet:
image: inputoutput/cardano-wallet:2021.4.8-shelley
image: inputoutput/cardano-wallet:2021.4.28-shelley
volumes:
- wallet-${NETWORK}-db:/wallet-db
- node-ipc:/ipc
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/cardano-wallet-cli.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet-cli
version: 2021.4.8
version: 2021.4.28
synopsis: Utilities for a building Command-Line Interfaces
homepage: https://github.com/input-output-hk/cardano-wallet
author: IOHK Engineering Team
Expand Down
2 changes: 1 addition & 1 deletion lib/core-integration/cardano-wallet-core-integration.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet-core-integration
version: 2021.4.8
version: 2021.4.28
synopsis: Core integration test library.
description: Shared core functionality for our integration test suites.
homepage: https://github.com/input-output-hk/cardano-wallet
Expand Down
2 changes: 1 addition & 1 deletion lib/core/cardano-wallet-core.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet-core
version: 2021.4.8
version: 2021.4.28
synopsis: The Wallet Backend for a Cardano node.
description: Please see README.md
homepage: https://github.com/input-output-hk/cardano-wallet
Expand Down
2 changes: 1 addition & 1 deletion lib/launcher/cardano-wallet-launcher.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet-launcher
version: 2021.4.8
version: 2021.4.28
synopsis: Utilities for a building commands launcher
homepage: https://github.com/input-output-hk/cardano-wallet
author: IOHK Engineering Team
Expand Down
2 changes: 1 addition & 1 deletion lib/shelley/cardano-wallet.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet
version: 2021.4.8
version: 2021.4.28
synopsis: Wallet backend protocol-specific bits implemented using Shelley nodes
description: Please see README.md
homepage: https://github.com/input-output-hk/cardano-wallet
Expand Down
2 changes: 1 addition & 1 deletion lib/test-utils/cardano-wallet-test-utils.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet-test-utils
version: 2021.4.8
version: 2021.4.28
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
Expand Down
2 changes: 1 addition & 1 deletion lib/text-class/text-class.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: text-class
version: 2021.4.8
version: 2021.4.28
synopsis: Extra helpers to convert data-types to and from Text
homepage: https://github.com/input-output-hk/cardano-wallet
author: IOHK Engineering Team
Expand Down
2 changes: 1 addition & 1 deletion nix/.stack.nix/cardano-wallet-cli.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/.stack.nix/cardano-wallet-core-integration.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/.stack.nix/cardano-wallet-core.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/.stack.nix/cardano-wallet-launcher.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/.stack.nix/cardano-wallet-test-utils.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/.stack.nix/cardano-wallet.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/.stack.nix/text-class.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions scripts/make_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ set -euo pipefail
################################################################################
# Release-specific parameters (Change when you bump the version)
# Release tags must follow format vYYYY-MM-DD.
OLD_GIT_TAG="v2021-03-04"
GIT_TAG="v2021-04-08"
GIT_TAG="v2021-04-28"
OLD_GIT_TAG="v2021-04-08"

CARDANO_NODE_TAG="1.25.1"
CARDANO_NODE_TAG="1.26.2"

################################################################################
# Tag munging functions
Expand Down
2 changes: 1 addition & 1 deletion specifications/api/swagger.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
openapi: 3.0.0
info:
title: Cardano Wallet Backend API
version: 2021.4.8
version: 2021.4.28
license:
name: Apache-2.0
url: https://raw.githubusercontent.com/input-output-hk/cardano-wallet/master/LICENSE
Expand Down

0 comments on commit 1d37426

Please sign in to comment.