LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #13692: contrib: Clone core repo in gitian-build

Browse source 
fa7f8a7769 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
This commit is contained in:
Wladimir J. van der Laan 2018-07-18 11:55:59 +02:00
commit f5d166acf9
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/gitian-build.py Normal file → Executable file
View file

@ -7,7 +7,7 @@ import sys
def setup(): def setup():
global args, workdir global args, workdir
programs = ['ruby', 'git', 'apt-cacher-ng'] programs = ['ruby', 'git', 'apt-cacher-ng', 'make', 'wget']
if args.kvm: if args.kvm:
programs += ['python-vm-builder', 'qemu-kvm', 'qemu-utils'] programs += ['python-vm-builder', 'qemu-kvm', 'qemu-utils']
elif args.docker: elif args.docker:
@ -21,6 +21,8 @@ def setup():
subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin-core/bitcoin-detached-sigs.git']) subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin-core/bitcoin-detached-sigs.git'])
if not os.path.isdir('gitian-builder'): if not os.path.isdir('gitian-builder'):
subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git']) 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') os.chdir('gitian-builder')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64'] make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker: 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+'-linux/'+args.signer])
subprocess.check_call(['git', 'add', args.version+'-win-unsigned/'+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', '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) os.chdir(workdir)
def sign(): def sign():

2
doc/release-process.md
View file

@ -157,7 +157,7 @@ Commit your signature to gitian.sigs:
git add ${VERSION}-linux/"${SIGNER}" git add ${VERSION}-linux/"${SIGNER}"
git add ${VERSION}-win-unsigned/"${SIGNER}" git add ${VERSION}-win-unsigned/"${SIGNER}"
git add ${VERSION}-osx-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 git push # Assuming you can push to the gitian.sigs tree
popd popd