updates sha256sum in gitlian-build.py (#1099)

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* Updated config.yml

* updates gitlian-build.py

* updates sha256sum

* updates sha256

* updates raw GH content

* changes path of gbuild, gsign, gverify for testing

* trying again

* adds print for current working directory

* revert and use orignal bin path

* trying circle build with os.getcwd()

* Updated config.yml

* reverts bin path again while updating circleci

* testing shell=True

* reverts shell=True changes docker defaults

* testing cmd

* testing array to string for cmd

* more path testing

* trying with cmdBuildArgs

* moving bin into cmdBuildArgs

* updated cmdBuildArgs

* again

* trying Popen

* adds cmdSignArgs for linux

* typo

* adds cmdMoveArgs

* testing macos build

* correction for args url

* added cmdMoveArgs2

* adds windows build

.circleci/config.yml

@@ -6,7 +6,7 @@ defaults: &defaults
 
 defaults-docker: &defaults-docker
   docker:
-    - image: cimg/base:edge-22.04
+    - image: circleci/buildpack-deps:bionic
 
 run_apt_packages: &run_apt_packages
   name: Prepare VM
@@ -60,7 +60,7 @@ jobs:
           command: mv verge-binaries/${CIRCLE_BRANCH:-${CIRCLE_TAG:-master}}/ bin
       - persist_to_workspace:
           root: .
-          paths: 'bin'
+          paths: ['bin']
 
   release-macos:
     <<: *defaults
@@ -84,7 +84,7 @@ jobs:
           command: mv verge-binaries/${CIRCLE_BRANCH:-${CIRCLE_TAG:-master}}/ bin
       - persist_to_workspace:
           root: .
-          paths: 'bin'
+          paths: ['bin']
 
   release-linux:
     <<: *defaults

contrib/gitian-build.py

@@ -56,31 +56,64 @@ def build():
     os.chdir('gitian-builder')
     os.makedirs('inputs', exist_ok=True)
 
-    subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://github.com/vergecurrency/osslsigncode-1.7.1.tar.gz/blob/master/osslsigncode-1.7.1.tar.gz'])
-    subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch'])
+    subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://raw.githubusercontent.com/vergecurrency/osslsigncode-1.7.1.tar.gz/master/osslsigncode-1.7.1.tar.gz'])
+    subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://raw.githubusercontent.com/vergecurrency/osslsigncode-1.7.1.tar.gz/master/osslsigncode-Backports-to-1.7.1.patch'])
     subprocess.check_call(["echo 'a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911 inputs/osslsigncode-Backports-to-1.7.1.patch' | sha256sum -c"], shell=True)
     subprocess.check_call(["echo 'f9a8cdb38b9c309326764ebc937cba1523a3a751a7ab05df3ecc99d18ae466c9 inputs/osslsigncode-1.7.1.tar.gz' | sha256sum -c"], shell=True)
     subprocess.check_call(['make', '-C', '../verge/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common'])
 
     if args.linux:
         print('\nCompiling ' + args.version + ' Linux')
-        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'verge='+args.commit, '--url', 'verge='+args.url, '../verge/contrib/gitian-descriptors/gitian-linux.yml'])
-        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../gitian.sigs/', '../verge/contrib/gitian-descriptors/gitian-linux.yml'])
-        subprocess.check_call('mv build/out/verge-*.tar.gz build/out/src/verge-*.tar.gz ../verge-binaries/'+args.version, shell=True)
+        print('Working Directory ' + os.getcwd())
+        print(args.jobs)
+        print(args.memory)
+        print(args.commit)
+        cmdBuildArgs = os.getcwd() + '/bin/gbuild -j ' + args.jobs + ' -m ' + args.memory + ' --commit verge='+args.commit + '--url verge=' + args.url + '/verge/contrib/gitian-descriptors/gitian-linux.yml'
+        print(cmdBuildArgs)
+        subprocess.Popen(cmdBuildArgs, shell=True)
+        cmdSignArgs = os.getcwd() + '/bin/gsign -p ' + args.sign_prog + ' --signer ' + args.signer + ' --release ' + args.version + '-linux --destination ' + args.url + '/gitian.sigs/ ' + args.url + '/verge/contrib/gitian-descriptors/gitian-linux.yml'
+        print(cmdSignArgs)
+        subprocess.Popen(cmdSignArgs, shell=True)
+        cmdMoveArgs = 'mv build/out/verge-*.tar.gz build/out/src/verge-*.tar.gz ' +  os.getcwd() + '/verge-binaries/' + args.version
+        print(cmdMoveArgs)
+        subprocess.Popen(cmdMoveArgs, shell=True)
 
     if args.windows:
         print('\nCompiling ' + args.version + ' Windows')
-        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'verge='+args.commit, '--url', 'verge='+args.url, '../verge/contrib/gitian-descriptors/gitian-win.yml'])
-        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-unsigned', '--destination', '../gitian.sigs/', '../verge/contrib/gitian-descriptors/gitian-win.yml'])
-        subprocess.check_call('mv build/out/verge-*-win-unsigned.tar.gz inputs/', shell=True)
-        subprocess.check_call('mv build/out/verge-*.zip build/out/verge-*.exe ../verge-binaries/'+args.version, shell=True)
+        print('Working Directory ' + os.getcwd())
+        print(args.jobs)
+        print(args.memory)
+        print(args.commit)
+        cmdBuildArgs = os.getcwd() + '/bin/gbuild -j ' + args.jobs + ' -m' + args.memory + ' --commit verge=' + args.commit + ' --url verge=' + args.url + '/verge/contrib/gitian-descriptors/gitian-win.yml'
+        print(cmdBuildArgs)
+        subprocess.Popen(cmdBuildArgs, shell=True)
+        cmdSignArgs = os.getcwd() + '/bin/gsign -p ' + args.sign_prog + ' --signer ' + args.signer + ' --release ' + args.version + '-win-unsigned --destination ' + args.url + '/gitian.sigs/ ' + args.url + '/verge/contrib/gitian-descriptors/gitian-win.yml'
+        print(cmdSignArgs)
+        subprocess.Popen(cmdSignArgs, shell=True)
+        cmdMoveArgs = 'mv build/out/verge-*-win-unsigned.tar.gz inputs/'
+        print(cmdMoveArgs)
+        subprocess.Popen(cmdMoveArgs, shell=True)
+        cmdMoveArgs2 = 'mv build/out/verge-*.zip build/out/verge-*.exe' + os.getcwd() + '/verge-binaries/' + args.version
+        print(cmdMoveArgs2)
+        subprocess.Popen(cmdMoveArgs2, shell=True)
 
     if args.macos:
         print('\nCompiling ' + args.version + ' MacOS')
-        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'verge='+args.commit, '--url', 'verge='+args.url, '../verge/contrib/gitian-descriptors/gitian-osx.yml'])
-        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-unsigned', '--destination', '../gitian.sigs/', '../verge/contrib/gitian-descriptors/gitian-osx.yml'])
-        subprocess.check_call('mv build/out/verge-*-osx-unsigned.tar.gz inputs/', shell=True)
-        subprocess.check_call('mv build/out/verge-*.tar.gz build/out/verge-*.dmg ../verge-binaries/'+args.version, shell=True)
+        print('Working Directory ' + os.getcwd())
+        print(args.jobs)
+        print(args.memory)
+        print(args.commit)
+        cmdBuildArgs = os.getcwd() + '/bin/gbuild -j ' + args.jobs + ' -m ' + args.memory + ' --commit verge=' + args.commit + ' --url verge=' + args.url + '/verge/contrib/gitian-descriptors/gitian-osx.yml'
+        print(cmdBuildArgs)
+        subprocess.Popen(cmdBuildArgs, shell=True)
+        cmdSignArgs = os.getcwd() + '/bin/gsign -p ' + args.sign_prog + ' --signer ' + args.signer + ' --release ' + args.version + '-osx-unsigned --destination ' + args.url + '/gitian.sigs/ ' + args.url +  '/verge/contrib/gitian-descriptors/gitian-osx.yml'
+        print(cmdSignArgs)
+        subprocess.Popen(cmdSignArgs, shell=True)
+        cmdMoveArgs = 'mv build/out/verge-*-osx-unsigned.tar.gz inputs/'
+        subprocess.Popen(cmdMoveArgs, shell=True)
+        cmdMoveArgs2 = 'mv build/out/verge-*.tar.gz build/out/verge-*.dmg ' + os.getcwd() + '/verge-binaries/' + args.version
+        print(cmdMoveArgs2)
+        subprocess.Popen(cmdMoveArgs2, shell=True)
 
     os.chdir(workdir)