diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-07-18 11:55:59 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-07-18 11:57:14 +0200 |
| commit | f5d166acf90902bc7d2b020e82d99e7947720570 (patch) | |
| tree | 1c8b19ecc3814177bebdba8ff55b3872c17507fe | |
| parent | c01ab133d7ae7a35ee828b6ae3335aa9a82a05b9 (diff) | |
| parent | fa7f8a7769a4acf4368c9d59b852065a9596a079 (diff) | |
Merge #13692: contrib: Clone core repo in gitian-build
fa7f8a7769a4acf4368c9d59b852065a9596a079 contrib: Clone core repo in gitian-build (MarcoFalke)
Pull request description:
Cloning the core repo is mentioned in https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.md#first-time--new-builders and required later on in the script.
Also, remove a redundant `-a` option to `git commit` when commiting the signatures.
Also, install missing commands, which are required later on in the script.
Tree-SHA512: dde422fce27492cc00d2542962c6ceb6d9f1e7dbb64acc978c424a575548b7319de0d27d4270a512774e641ec06e62a3036315819e692bcd1be2fdfd8e5c0cf2
| -rwxr-xr-x[-rw-r--r--] | contrib/gitian-build.py | 6 | ||||
| -rw-r--r-- | doc/release-process.md | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py index f6ecb52d8a..1da9e43896 100644..100755 --- a/contrib/gitian-build.py +++ b/contrib/gitian-build.py @@ -7,7 +7,7 @@ import sys def setup(): global args, workdir - programs = ['ruby', 'git', 'apt-cacher-ng'] + programs = ['ruby', 'git', 'apt-cacher-ng', 'make', 'wget'] if args.kvm: programs += ['python-vm-builder', 'qemu-kvm', 'qemu-utils'] elif args.docker: @@ -21,6 +21,8 @@ def setup(): subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin-core/bitcoin-detached-sigs.git']) if not os.path.isdir('gitian-builder'): subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git']) + if not os.path.isdir('bitcoin'): + subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin/bitcoin.git']) os.chdir('gitian-builder') make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64'] if args.docker: @@ -70,7 +72,7 @@ def build(): subprocess.check_call(['git', 'add', args.version+'-linux/'+args.signer]) subprocess.check_call(['git', 'add', args.version+'-win-unsigned/'+args.signer]) subprocess.check_call(['git', 'add', args.version+'-osx-unsigned/'+args.signer]) - subprocess.check_call(['git', 'commit', '-a', '-m', 'Add '+args.version+' unsigned sigs for '+args.signer]) + subprocess.check_call(['git', 'commit', '-m', 'Add '+args.version+' unsigned sigs for '+args.signer]) os.chdir(workdir) def sign(): diff --git a/doc/release-process.md b/doc/release-process.md index 912b620794..f3fc4bdfdc 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -157,7 +157,7 @@ Commit your signature to gitian.sigs: git add ${VERSION}-linux/"${SIGNER}" git add ${VERSION}-win-unsigned/"${SIGNER}" git add ${VERSION}-osx-unsigned/"${SIGNER}" - git commit -a + git commit -m "Add ${VERSION} unsigned sigs for ${SIGNER}" git push # Assuming you can push to the gitian.sigs tree popd |