Skip to content

Commit f5d166a

Browse files
committed
Merge #13692: contrib: Clone core repo in gitian-build
fa7f8a7 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
2 parents c01ab13 + fa7f8a7 commit f5d166a

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

contrib/gitian-build.py

100644100755
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
def setup():
99
global args, workdir
10-
programs = ['ruby', 'git', 'apt-cacher-ng']
10+
programs = ['ruby', 'git', 'apt-cacher-ng', 'make', 'wget']
1111
if args.kvm:
1212
programs += ['python-vm-builder', 'qemu-kvm', 'qemu-utils']
1313
elif args.docker:
@@ -21,6 +21,8 @@ def setup():
2121
subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin-core/bitcoin-detached-sigs.git'])
2222
if not os.path.isdir('gitian-builder'):
2323
subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
24+
if not os.path.isdir('bitcoin'):
25+
subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin/bitcoin.git'])
2426
os.chdir('gitian-builder')
2527
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
2628
if args.docker:
@@ -70,7 +72,7 @@ def build():
7072
subprocess.check_call(['git', 'add', args.version+'-linux/'+args.signer])
7173
subprocess.check_call(['git', 'add', args.version+'-win-unsigned/'+args.signer])
7274
subprocess.check_call(['git', 'add', args.version+'-osx-unsigned/'+args.signer])
73-
subprocess.check_call(['git', 'commit', '-a', '-m', 'Add '+args.version+' unsigned sigs for '+args.signer])
75+
subprocess.check_call(['git', 'commit', '-m', 'Add '+args.version+' unsigned sigs for '+args.signer])
7476
os.chdir(workdir)
7577

7678
def sign():

doc/release-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ Commit your signature to gitian.sigs:
157157
git add ${VERSION}-linux/"${SIGNER}"
158158
git add ${VERSION}-win-unsigned/"${SIGNER}"
159159
git add ${VERSION}-osx-unsigned/"${SIGNER}"
160-
git commit -a
160+
git commit -m "Add ${VERSION} unsigned sigs for ${SIGNER}"
161161
git push # Assuming you can push to the gitian.sigs tree
162162
popd
163163

0 commit comments

Comments
 (0)