From 1c22cc1af1a05c60cf2452ad579484a8d4d55664 Mon Sep 17 00:00:00 2001 From: Mitchell Cash Date: Thu, 19 Jul 2018 09:33:05 +1000 Subject: [PATCH 1/2] doc: Update broken links to now point to gitian-build.py --- contrib/README.md | 2 +- doc/release-process.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/README.md b/contrib/README.md index a582a724f75..bcf9186fa11 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 f3fc4bdfdc6..1e705898fe4 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. @@ -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: From 95464c7519ca2b4eb9d2825518b6a75b5ddb7e87 Mon Sep 17 00:00:00 2001 From: Mitchell Cash Date: Wed, 18 Jul 2018 22:03:26 +1000 Subject: [PATCH 2/2] doc: Improve command to generate list of authors for release notes - Remove dependency on sed (sed was overkill when you can just add plain text to the git log --format command) - Sort resulting list of authors alphabetically (case-insensitive) - Provide an example of how to only generate authors between versions --- doc/release-process.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release-process.md b/doc/release-process.md index 1e705898fe4..3ba622ee6db 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -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