Skip to content

Commit

Permalink
Merge #2385 #2398
Browse files Browse the repository at this point in the history
2385: Upload swagger to bump.sh on release deployment r=piotr-iohk a=piotr-iohk

# Issue Number

ADP-600

<!-- Put here a reference to the issue this PR relates to and which requirements it tackles -->


# Overview

- 275956f
  Upload swagger upload to bump.sh on release
  
- ca0d72f
  Add API Changes section in Release template


# Comments

 - I have tested upload from Travis into bump.sh ->  https://bump.sh/doc/cardano-wallet-test/changes ✔️ 
 - swagger should be uploaded to https://bump.sh/doc/cardano-wallet-diff/changes on release deploy step
 - added `API Changes` section to release template with a note


2398: Update docker compose with Allegra compatible tags r=rvl a=melmccann

Update docker compose to reflect the Allegra docker compatible versions 

Co-authored-by: Piotr Stachyra <[email protected]>
Co-authored-by: Mel McCann <[email protected]>
  • Loading branch information
3 people authored Dec 17, 2020
3 parents b82b396 + ca0d72f + 54195f6 commit 19f2d3b
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .github/RELEASE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

Compatible with [`cardano-node@{{CARDANO_NODE_TAG}}`](https://github.com/input-output-hk/cardano-node/releases/tag/{{CARDANO_NODE_TAG}}).


## API Changes

<!-- Copy-paste most recent diff excerpt from https://bump.sh/doc/cardano-wallet-diff/changes -->


<!-- A CHANGELOG, organized in three sections:
- New Features
Expand Down
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
sudo: false

# Choose a build environment:
dist: xenial
dist: focal

# Only clone the repository tip & track all branches
git:
Expand Down Expand Up @@ -49,6 +49,13 @@ jobs:
if: type != pull_request AND (tag =~ ^v OR commit_message =~ /TRAVIS_TRIGGER_RELEASE/)
name: "Executables"
script:
# Upload swagger to bump.sh
- gem install bump-cli
- sudo snap install yq
- yq r -j specifications/api/swagger.yaml > specifications/api/swagger.json
- bump validate --doc $BUMP_SH_DOC_ID --token $BUMP_SH_TOKEN specifications/api/swagger.json
- bump deploy --doc $BUMP_SH_DOC_ID --token $BUMP_SH_TOKEN specifications/api/swagger.json

# Fetch the builds from Hydra
- nvm install 12.18.3 && nvm use 12.18.3
- npm install --no-save [email protected] [email protected]
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.18.0
image: inputoutput/cardano-node:1.24.2
environment:
NETWORK:
volumes:
Expand All @@ -18,7 +18,7 @@ services:
max-size: "50m"

cardano-wallet:
image: inputoutput/cardano-wallet:latest
image: inputoutput/cardano-wallet:2020.12.8-shelley
volumes:
- wallet-${NETWORK}-db:/wallet-db
- node-ipc:/ipc
Expand Down

0 comments on commit 19f2d3b

Please sign in to comment.