Skip to content

Commit

Permalink
Updated the Gitian build process
Browse files Browse the repository at this point in the history
  • Loading branch information
ChillingSilence committed May 9, 2021
1 parent c554b8c commit e0fb972
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions contrib/gitian-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def setup():
if not os.path.isdir('gitian-builder'):
subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
if not os.path.isdir('digibyte'):
subprocess.check_call(['git', 'clone', 'https://github.com/digibyte/digibyte.git'])
subprocess.check_call(['git', 'clone', 'https://github.com/digibyte-core/digibyte.git'])
os.chdir('gitian-builder')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker:
Expand All @@ -51,8 +51,8 @@ def build():
os.chdir('gitian-builder')
os.makedirs('inputs', exist_ok=True)

subprocess.check_call(['wget', '-N', '-P', 'inputs', 'http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz'])
subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://digibytecore.org/cfields/osslsigncode-Backports-to-1.7.1.patch'])
subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://github.com/DigiByte-Core/osslsigncode-1.7.1.tar.gz-1/raw/master/osslsigncode-1.7.1.tar.gz'])
subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://raw.githubusercontent.com/DigiByte-Core/osslsigncode-1.7.1.tar.gz-1/master/osslsigncode-Backports-to-1.7.1.patch'])
subprocess.check_call(['make', '-C', '../digibyte/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common'])

if args.linux:
Expand Down
12 changes: 6 additions & 6 deletions contrib/gitian-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ osx=true
SIGNER=
VERSION=
commit=false
url=https://github.com/digibyte/digibyte
url=https://github.com/digibyte-core/digibyte
proc=2
mem=2000
lxc=true
osslTarUrl=http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
osslPatchUrl=https://digibytecore.org/cfields/osslsigncode-Backports-to-1.7.1.patch
osslTarUrl=https://github.com/DigiByte-Core/osslsigncode-1.7.1.tar.gz-1/raw/master/osslsigncode-1.7.1.tar.gz
osslPatchUrl=https://raw.githubusercontent.com/DigiByte-Core/osslsigncode-1.7.1.tar.gz-1/master/osslsigncode-Backports-to-1.7.1.patch
scriptName=$(basename -- "$0")
signProg="gpg --detach-sign"
commitFiles=true
Expand All @@ -38,7 +38,7 @@ version Version number, commit, or branch to build. If building a commit or bra
Options:
-c|--commit Indicate that the version argument is for a commit or branch
-u|--url Specify the URL of the repository. Default is https://github.com/digibyte/digibyte
-u|--url Specify the URL of the repository. Default is https://github.com/digibyte-core/digibyte
-v|--verify Verify the Gitian build
-b|--build Do a Gitian build
-s|--sign Make signed binaries for Windows and Mac OSX
Expand Down Expand Up @@ -229,8 +229,8 @@ echo ${COMMIT}
if [[ $setup = true ]]
then
sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm qemu-utils
git clone https://github.com/digibyte/gitian.sigs.git
git clone https://github.com/digibyte/digibyte-detached-sigs.git
git clone https://github.com/digibyte-core/gitian.sigs.git
git clone https://github.com/digibyte-core/digibyte-detached-sigs.git
git clone https://github.com/devrandom/gitian-builder.git
pushd ./gitian-builder
if [[ -n "$USE_LXC" ]]
Expand Down

0 comments on commit e0fb972

Please sign in to comment.