Skip to content

Commit 1dcc482

Browse files
committed
Update CHANGELOG.md for -rc2.
And fix trivial typo in MAKING-RELEASES.md, and date retreival in build-release.sh and repro-build.sh (real git tags start with v!) Signed-off-by: Rusty Russell <[email protected]>
1 parent dce5839 commit 1dcc482

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## [0.7.0-rc1]
7+
## [0.7.0rc2] - 2019-02-26
88

99
### Added
1010

@@ -309,7 +309,7 @@ There predate the BOLT specifications, and are only of vague historic interest:
309309
6. [0.5.1] - 2016-10-21
310310
7. [0.5.2] - 2016-11-21: "Bitcoin Savings & Trust Daily Interest II"
311311

312-
[0.7.0-rc1]: https://github.com/ElementsProject/lightning/compare/v0.6.3...HEAD
312+
[0.7.0-rc2]: https://github.com/ElementsProject/lightning/compare/v0.6.3...HEAD
313313
[0.6.3]: https://github.com/ElementsProject/lightning/releases/tag/v0.6.3
314314
[0.6.2]: https://github.com/ElementsProject/lightning/releases/tag/v0.6.2
315315
[0.6.1]: https://github.com/ElementsProject/lightning/releases/tag/v0.6.1

doc/MAKING-RELEASES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Here's a checklist for the release process.
1313

1414
### Prepering for -rc1
1515

16-
1. Check that CHANGELOG.md is well formetted, ordered in areas,
16+
1. Check that CHANGELOG.md is well formatted, ordered in areas,
1717
covers all signficant changes, and sub-ordered approximately by user impact
1818
& coolness.
1919
2. Update the CHANGELOG.md with [Unreleased] changed to -rc1, and add a new

tools/build-release.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ if [ "$VERSION" = "" ]; then
6464
exit 1
6565
fi
6666

67-
MTIME=${FORCE_MTIME:-$(sed -n "s/^## \\[$VERSION\\] - \\([-0-9]*\\).*/\\1/p" < CHANGELOG.md)}
67+
# Skip 'v' here in $VERSION
68+
MTIME=${FORCE_MTIME:-$(sed -n "s/^## \\[${VERSION#v}\\] - \\([-0-9]*\\).*/\\1/p" < CHANGELOG.md)}
6869
if [ -z "$MTIME" ]; then
6970
echo "No date found for $VERSION in CHANGELOG.md" >&2
7071
exit 1

tools/repro-build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ PLATFORM="$OS"-"$VER"
5454
VERSION=$(git describe --always --dirty=-modded --abbrev=7 2>/dev/null || pwd | sed -n 's,.*/clightning-\(v[0-9.rc]*\)$,\1,p')
5555

5656
# eg. ## [0.6.3] - 2019-01-09: "The Smallblock Conspiracy"
57-
MTIME=${FORCE_MTIME:-$(sed -n "s/^## \\[$VERSION\\] - \\([-0-9]*\\).*/\\1/p" < CHANGELOG.md)}
57+
# Skip 'v' here in $VERSION
58+
MTIME=${FORCE_MTIME:-$(sed -n "s/^## \\[${VERSION#v}\\] - \\([-0-9]*\\).*/\\1/p" < CHANGELOG.md)}
5859
if [ -z "$MTIME" ]; then
5960
echo "No date found for $VERSION in CHANGELOG.md" >&2
6061
exit 1

0 commit comments

Comments
 (0)