Skip to content

Commit

Permalink
Merge #2323
Browse files Browse the repository at this point in the history
2323: Bump version from 2020.11.3 to 2020.11.17 r=rvl a=rvl

### Issue Number

None

### Overview

- Bumps cabal package versions from 2020.11.3 to 2020.11.17
- Tweaks to the `make_release.sh` and `make_changelog.sh` scripts.


Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
  • Loading branch information
iohk-bors[bot] and rvl committed Nov 17, 2020
2 parents 98c35df + 16d32a0 commit db02ac0
Show file tree
Hide file tree
Showing 21 changed files with 101 additions and 79 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ result*

### auto-generated faulty JSON golden tests ###
*.faulty.json

### Release scripts output
/GENERATED_*.md
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: 2020.11.3
version: 2020.11.17
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: 2020.11.3
version: 2020.11.17
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: 2020.11.3
version: 2020.11.17
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/jormungandr/cardano-wallet-jormungandr.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet-jormungandr
version: 2020.11.3
version: 2020.11.17
synopsis: Wallet backend protocol-specific bits implemented using Jörmungandr
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: 2020.11.3
version: 2020.11.17
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: 2020.11.3
version: 2020.11.17
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: 2020.11.3
version: 2020.11.17
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: 2020.11.3
version: 2020.11.17
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-jormungandr.nix

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

5 changes: 4 additions & 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.

53 changes: 0 additions & 53 deletions scripts/make_changelog

This file was deleted.

68 changes: 68 additions & 0 deletions scripts/make_changelog.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#!/usr/bin/env bash

# Constructs a CHANGELOG using every PR merged since a given date. It
# groups PRs by milestones.
#
# /!\ depends on 'jq' and 'curl' /!\
#
# Usage:
# ./make_changelog.sh YYYY-MM-DD
#
# Example:
# ./make_changelog.sh 2019-08-15

# NOTE: You can optionally set $GITHUB_API_TOKEN before running this
# script to avoid GitHub rate limit errors.

set -euo pipefail

repo="input-output-hk/cardano-wallet"
since_date="${1:-}"

if [ -z "$since_date" ]; then
echo "usage: $0 YYYY-MM-DD"
exit 1
fi

fetch_prs() {
if [ -z "${GITHUB_API_TOKEN:-}" ]; then
echo "warning: GITHUB_API_TOKEN is not set. You may get a rate limit error when fetching pull requests." > /dev/stderr
auth_header=""
else
auth_header="-H 'Authorization: token $GITHUB_API_TOKEN'"
fi

url="https://api.github.com/search/issues?per_page=500&q=repo:$1+is:pr+is:merged+merged:%3E$2"
echo "Fetching $url" > /dev/stderr
curl --silent $auth_header \
-H "Accept: application/vnd.github.v3+json" \
"$url"
}

pull_requests=$(fetch_prs "$repo" "$since_date" | jq '.items | map({number:.number,title:.title,label:.labels[0].name}) | group_by(.label)')

items=$(jq 'map(map("\(.title) #\(.number)"))' <<< "$pull_requests")
labels=$(jq 'map(map("\(.label)") | unique) | flatten' <<< "$pull_requests")

labels_max=$(jq 'length - 1' <<< "$labels")

for i in $(seq 0 $labels_max); do
label=$(jq -r ".[$i]" <<< "$labels")
case $label in
"null")
echo "## Unclassified (Move user-facing items to correct section. Delete the rest)"
;;
"ADDING FEATURE")
echo "## New Features"
;;
"IMPROVEMENT")
echo "## Improvements"
;;
"RESOLVING ISSUE")
echo "## Resolved Issues"
;;
esac
echo ""
jq -r '.['$i'] | .[] | "- \(.)"' <<< "$items"
echo ""
done
19 changes: 10 additions & 9 deletions scripts/make_release.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p nix coreutils gnugrep gnused
#! nix-shell -i bash -p nix coreutils gnugrep gnused jq curl

set -euo pipefail

Expand All @@ -17,14 +17,16 @@ set -euo pipefail

################################################################################
# Release-specific parameters (Change when you bump the version)
# Do not use trailing zeros, ie., not 2020.11.03 but 2020.11.3
OLD_GIT_TAG="v2020-10-13"
OLD_CABAL_VERSION="2020.10.13"
#
# Use trailing zeros for the date in the git tag, but
# do not use trailing zeros for the Cabal version.
# i.e. v2020-11-03 and not 2020.11.03 but 2020.11.3
OLD_GIT_TAG="v2020-11-03"
OLD_CABAL_VERSION="2020.11.3"

GIT_TAG="v2020-11-3"
CABAL_VERSION="2020.11.3"
GIT_TAG="v2020-11-17"
CABAL_VERSION="2020.11.17"

JORM_TAG="v0.9.0"
CARDANO_NODE_TAG="1.21.1"
################################################################################
OLD_DATE="${OLD_GIT_TAG//v}"
Expand All @@ -42,11 +44,10 @@ git grep $OLD_CABAL_VERSION
echo ""

echo "Generating changelog..."
./scripts/make_changelog $OLD_DATE > $CHANGELOG
./scripts/make_changelog.sh $OLD_DATE > $CHANGELOG
echo ""
echo "Filling in template..."
sed -e "s/{{GIT_TAG}}/$GIT_TAG/g" \
-e "s/{{JORM_TAG}}/$JORM_TAG/g" \
-e "s/{{CARDANO_NODE_TAG}}/$CARDANO_NODE_TAG/g" \
-e "s/{{CABAL_VERSION}}/$CABAL_VERSION/g" \
-e "s/{{WIKI_COMMIT}}/$WIKI_COMMIT/g" \
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: 2020.11.3
version: 2020.11.17
license:
name: Apache-2.0
url: https://raw.githubusercontent.com/input-output-hk/cardano-wallet/master/LICENSE
Expand Down

0 comments on commit db02ac0

Please sign in to comment.