aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-07-25 07:13:20 -0400
committerMarcoFalke <falke.marco@gmail.com>2018-07-25 07:13:22 -0400
commit94dd89e6fa37d4d81c9e6787f965bc522242300d (patch)
treeaf776500e49410aa04c1348b31fa12f0f3354a54
parenta140953907eb522f891b5f8ab0fd9b6d1bf3195e (diff)
parent95464c7519ca2b4eb9d2825518b6a75b5ddb7e87 (diff)
Merge #13706: doc: Minor improvements to release-process.md
95464c7519 doc: Improve command to generate list of authors for release notes (Mitchell Cash) 1c22cc1af1 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
-rw-r--r--contrib/README.md2
-rw-r--r--doc/release-process.md6
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/README.md b/contrib/README.md
index a582a724f7..bcf9186fa1 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -37,7 +37,7 @@ Scripts and notes for Mac builds.
### [RPM](/contrib/rpm) ###
RPM spec file for building bitcoin-core on RPM based distributions.
-### [Gitian-build](/contrib/gitian-build.sh) ###
+### [Gitian-build](/contrib/gitian-build.py) ###
Script for running full Gitian builds.
Test and Verify Tools
diff --git a/doc/release-process.md b/doc/release-process.md
index f3fc4bdfdc..3ba622ee6d 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -29,7 +29,7 @@ Before every major release:
### First time / New builders
-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.
+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.
Check out the source code in the following directory hierarchy.
@@ -50,7 +50,7 @@ and sort them into categories based on labels)
Generate list of authors:
- git log --format='%aN' "$*" | sort -ui | sed -e 's/^/- /'
+ git log --format='- %aN' v(current version, e.g. 0.16.0)..v(new version, e.g. 0.16.1) | sort -fiu
Tag version (or release candidate) in git
@@ -58,7 +58,7 @@ Tag version (or release candidate) in git
### Setup and perform Gitian builds
-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.
+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.
Setup Gitian descriptors: