diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-30 20:50:37 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-30 20:50:44 +0200 |
| commit | 7b784cc2bbcdc90361add2adb657c58162aca4ef (patch) | |
| tree | cb61470f4a76de3dec3e0775883f2bbf6a4debf1 /doc | |
| parent | 940748b4b08700ca2a4e790bd22bcc64ee80b6fe (diff) | |
| parent | 203e2ddad8e544803491d1e9e9ca2b6e26a15f8e (diff) | |
| download | bitcoin-7b784cc2bbcdc90361add2adb657c58162aca4ef.tar.xz | |
Merge #8852: Mention Gitian building script in doc (Laudaa)
203e2dd Mention Gitian building script in doc. (Lauda)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/gitian-building.md | 2 | ||||
| -rw-r--r-- | doc/release-process.md | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/gitian-building.md b/doc/gitian-building.md index 4914d90df4..442d2d605f 100644 --- a/doc/gitian-building.md +++ b/doc/gitian-building.md @@ -336,6 +336,8 @@ There will be a lot of warnings printed during the build of the image. These can Getting and building the inputs -------------------------------- +At this point you have two options, you can either use the automated script (found in [contrib/gitian-build.sh](/contrib/gitian-build.sh)) or you could manually do everything by following this guide. If you're using the automated script, then run it with the "--setup" command. Afterwards, run it with the "--build" command (example: "contrib/gitian-building.sh -b signer 0.13.0"). Otherwise ignore this. + Follow the instructions in [doc/release-process.md](release-process.md#fetch-and-create-inputs-first-time-or-when-dependency-versions-change) in the bitcoin repository under 'Fetch and create inputs' to install sources which require manual intervention. Also optionally follow the next step: 'Seed the Gitian sources cache diff --git a/doc/release-process.md b/doc/release-process.md index 04d9473c20..d07f9a89ad 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -19,6 +19,8 @@ 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. + Check out the source code in the following directory hierarchy. cd /path/to/your/toplevel/build @@ -62,6 +64,8 @@ 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. + Setup Gitian descriptors: pushd ./bitcoin |