From 05f24daf2fab6ec9f0148981202fb27ba27c7d8c Mon Sep 17 00:00:00 2001 From: Justin Moon Date: Fri, 25 Dec 2020 23:18:09 -0600 Subject: [PATCH] Separate branches for signed/unsigned Gitian builds --- gitian-building.md | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/gitian-building.md b/gitian-building.md index 38afea9..cfa5222 100644 --- a/gitian-building.md +++ b/gitian-building.md @@ -1,6 +1,6 @@ # Gitian Building -Last updated: December 12, 2020 +Last updated: December 25, 2020 *This is based on fanquake's [gitian-building](https://github.com/fanquake/core-review/blob/master/gitian-building/README.md), @@ -167,10 +167,6 @@ export VERSION=0.21.0rc3 export SIGNER=your_username export USE_DOCKER=1 -pushd gitian.sigs -git checkout -b $SIGNER-$VERSION -popd - pushd bitcoin git checkout v$VERSION popd @@ -178,6 +174,14 @@ popd ## Build Unsigned Sigs +Since we'll be creating a PR to the `gitian.sigs` repo, make a new branch off master: + +```bash +pushd gitian.sigs +git checkout -b $SIGNER-$VERSION-unsigned master +popd +``` + All of the instructions in this section are to be run from within the `gitian-builder` directory: @@ -277,6 +281,16 @@ You would normally run both of these (macOS and Windows) and submit the results in one PR. These build far faster than the builds for the unsigned signatures -- within a minute or so, or even a few seconds. +Since we'll be creating a PR to the `gitian.sigs` repo, make a new branch off master: + +```bash +pushd gitian.sigs +git checkout -b $SIGNER-$VERSION-signed master +popd +``` + +Then navigate to `gitian-builder` + ``` pushd gitian-builder ```