diff options
-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 |