Skip to content

Commit 94dd89e

Browse files
author
MarcoFalke
committed
Merge #13706: doc: Minor improvements to release-process.md
95464c7 doc: Improve command to generate list of authors for release notes (Mitchell Cash) 1c22cc1 doc: Update broken links to now point to gitian-build.py (Mitchell Cash) Pull request description: - Update broken links - Improve command to generate list of authors for a release --- I also note that it asks to ping **wumpus** on IRC, to assist in generating a list of merged pulls and sort them into categories based on labels. I tried to turn this into a simple one-liner as well (something like ``git log --merges --format="- \`%h\` %s (%an)" v0.16.0..v0.16.1``), but it didn't seem to capture everything I needed. Would it be worthwhile **wumpus** open-sourcing his code into `contrib/devtools` so there is no single point of failure (even if it can manually be worked around). Tree-SHA512: 8e7f0880ff07ce8fe67b74de3f2c4b78dafe2c95eefb0617fa319ff196232967cb22ee75a183a39f93bfc6e0bf85547689160139312cee5956af2c069b8a3b6a
2 parents a140953 + 95464c7 commit 94dd89e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

contrib/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Scripts and notes for Mac builds.
3737
### [RPM](/contrib/rpm) ###
3838
RPM spec file for building bitcoin-core on RPM based distributions.
3939

40-
### [Gitian-build](/contrib/gitian-build.sh) ###
40+
### [Gitian-build](/contrib/gitian-build.py) ###
4141
Script for running full Gitian builds.
4242

4343
Test and Verify Tools

doc/release-process.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Before every major release:
2929

3030
### First time / New builders
3131

32-
If you're using the automated script (found in [contrib/gitian-build.sh](/contrib/gitian-build.sh)), then at this point you should run it with the "--setup" command. Otherwise ignore this.
32+
If you're using the automated script (found in [contrib/gitian-build.py](/contrib/gitian-build.py)), then at this point you should run it with the "--setup" command. Otherwise ignore this.
3333

3434
Check out the source code in the following directory hierarchy.
3535

@@ -50,15 +50,15 @@ and sort them into categories based on labels)
5050

5151
Generate list of authors:
5252

53-
git log --format='%aN' "$*" | sort -ui | sed -e 's/^/- /'
53+
git log --format='- %aN' v(current version, e.g. 0.16.0)..v(new version, e.g. 0.16.1) | sort -fiu
5454

5555
Tag version (or release candidate) in git
5656

5757
git tag -s v(new version, e.g. 0.8.0)
5858

5959
### Setup and perform Gitian builds
6060

61-
If you're using the automated script (found in [contrib/gitian-build.sh](/contrib/gitian-build.sh)), then at this point you should run it with the "--build" command. Otherwise ignore this.
61+
If you're using the automated script (found in [contrib/gitian-build.py](/contrib/gitian-build.py)), then at this point you should run it with the "--build" command. Otherwise ignore this.
6262

6363
Setup Gitian descriptors:
6464

0 commit comments

Comments
 (0)