From 7f01ebbf29ab5302c2323386400d8bee709a537a Mon Sep 17 00:00:00 2001 From: wowario Date: Wed, 1 Feb 2023 20:50:50 +0300 Subject: [PATCH] update gitian --- contrib/gitian/dockrun.sh | 6 +++--- contrib/gitian/gitian-android.yml | 12 ++++++------ contrib/gitian/gitian-build.py | 26 +++++++++++++------------- contrib/gitian/gitian-freebsd.yml | 10 +++++----- contrib/gitian/gitian-linux.yml | 10 +++++----- contrib/gitian/gitian-osx.yml | 10 +++++----- contrib/gitian/gitian-win.yml | 10 +++++----- 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/contrib/gitian/dockrun.sh b/contrib/gitian/dockrun.sh index 396db126b..e4149e4cd 100755 --- a/contrib/gitian/dockrun.sh +++ b/contrib/gitian/dockrun.sh @@ -41,10 +41,10 @@ RUN useradd -ms /bin/bash -U ubuntu -G docker USER ubuntu:docker WORKDIR $WORKDIR -RUN git clone https://github.com/monero-project/gitian.sigs.git sigs; \ +RUN git clone https://git.wownero.com/wownero/gitian.sigs.git sigs; \ git clone https://github.com/devrandom/gitian-builder.git builder; \ cd builder; git checkout c0f77ca018cb5332bfd595e0aff0468f77542c23; mkdir -p inputs var; cd inputs; \ - git clone https://github.com/monero-project/monero + git clone https://git.wownero.com/wownero/wownero CMD ["sleep", "infinity"] EOF @@ -109,7 +109,7 @@ if [ "$check" != "sign" ]; then fi if [ ! -d sigs ]; then - git clone https://github.com/monero-project/gitian.sigs.git sigs + git clone https://git.wownero.com/wownero/gitian.sigs.git sigs cd sigs git remote add $GH_USER git@github.com:$GH_USER/gitian.sigs.git cd .. diff --git a/contrib/gitian/gitian-android.yml b/contrib/gitian/gitian-android.yml index 7b2c840f5..fca851185 100644 --- a/contrib/gitian/gitian-android.yml +++ b/contrib/gitian/gitian-android.yml @@ -1,5 +1,5 @@ --- -name: "monero-android-0.18" +name: "wownero-android-0.11" enable_cache: true suites: - "bionic" @@ -26,8 +26,8 @@ packages: - "cmake" - "unzip" remotes: -- "url": "https://github.com/monero-project/monero.git" - "dir": "monero" +- "url": "https://git.wownero.com/wownero/wownero.git" + "dir": "wownero" files: [] script: | @@ -70,7 +70,7 @@ script: | then ABI=$i"eabi" fi - NDKDIR="${BUILD_DIR}/monero/contrib/depends/$i/native/bin" + NDKDIR="${BUILD_DIR}/wownero/contrib/depends/$i/native/bin" for prog in ${FAKETIME_HOST_PROGS}; do WRAPPER=${WRAP_DIR}/${ABI}-${prog} echo '#!/usr/bin/env bash' > ${WRAPPER} @@ -92,7 +92,7 @@ script: | export SOURCE_DATE_EPOCH=`date -d 2000-01-01T12:00:00 +%s` git config --global core.abbrev 9 - cd monero + cd wownero # Set the version string that gets added to the tar archive name version="`git describe`" if [[ $version == *"-"*"-"* ]]; then @@ -122,7 +122,7 @@ script: | chmod 755 bin/* cp ../utils/conf/wow.conf bin chmod 644 bin/wow.conf - DISTNAME=monero-${i}-${version} + DISTNAME=wownero-${i}-${version} mv bin ${DISTNAME} find ${DISTNAME}/ | sort | tar --no-recursion --owner=0 --group=0 -c -T - | bzip2 -9 > ${OUTDIR}/${DISTNAME}.tar.bz2 cd .. diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py index 859f460a7..c1d9553a8 100755 --- a/contrib/gitian/gitian-build.py +++ b/contrib/gitian/gitian-build.py @@ -5,7 +5,7 @@ import os import subprocess import sys -gsigs = 'https://github.com/monero-project/gitian.sigs.git' +gsigs = 'https://git.wownero.com/wownero/gitian.sigs.git' gbrepo = 'https://github.com/devrandom/gitian-builder.git' platforms = {'l': ['Linux', 'linux', 'tar.bz2'], @@ -31,10 +31,10 @@ def setup(): subprocess.check_call(['git', 'checkout', 'c0f77ca018cb5332bfd595e0aff0468f77542c23']) os.makedirs('inputs', exist_ok=True) os.chdir('inputs') - if os.path.isdir('monero'): - # Remove the potentially stale monero dir. Otherwise you might face submodule mismatches. - subprocess.check_call(['rm', 'monero', '-fR']) - subprocess.check_call(['git', 'clone', args.url, 'monero']) + if os.path.isdir('wownero'): + # Remove the potentially stale wownero dir. Otherwise you might face submodule mismatches. + subprocess.check_call(['rm', 'wownero', '-fR']) + subprocess.check_call(['git', 'clone', args.url, 'wownero']) os.chdir('..') make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64'] if args.docker: @@ -66,10 +66,10 @@ def rebuild(): suffix = platforms[i][2] print('\nCompiling ' + args.version + ' ' + os_name) - infile = 'inputs/monero/contrib/gitian/gitian-' + tag_name + '.yml' - subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'monero='+args.commit, '--url', 'monero='+args.url, infile]) + infile = 'inputs/wownero/contrib/gitian/gitian-' + tag_name + '.yml' + subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'wownero='+args.commit, '--url', 'wownero='+args.url, infile]) subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-'+tag_name, '--destination', '../sigs/', infile]) - subprocess.check_call('mv build/out/monero-*.' + suffix + ' ../out/'+args.version, shell=True) + subprocess.check_call('mv build/out/wownero-*.' + suffix + ' ../out/'+args.version, shell=True) print('Moving var/install.log to var/install-' + tag_name + '.log') subprocess.check_call('mv var/install.log var/install-' + tag_name + '.log', shell=True) print('Moving var/build.log to var/build-' + tag_name + '.log') @@ -93,7 +93,7 @@ def build(): os.chdir('builder') os.makedirs('inputs', exist_ok=True) - subprocess.check_call(['make', '-C', 'inputs/monero/contrib/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common']) + subprocess.check_call(['make', '-C', 'inputs/wownero/contrib/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common']) rebuild() @@ -104,7 +104,7 @@ def verify(): for i, v in platforms: print('\nVerifying v'+args.version+' '+v[0]+'\n') - subprocess.check_call(['bin/gverify', '-v', '-d', '../sigs/', '-r', args.version+'-'+v[1], 'inputs/monero/contrib/gitian/gitian-'+v[1]+'.yml']) + subprocess.check_call(['bin/gverify', '-v', '-d', '../sigs/', '-r', args.version+'-'+v[1], 'inputs/wownero/contrib/gitian/gitian-'+v[1]+'.yml']) os.chdir(workdir) def main(): @@ -113,7 +113,7 @@ def main(): parser = argparse.ArgumentParser(description='Script for running full Gitian builds.', usage='%(prog)s [options] signer version') parser.add_argument('-c', '--commit', action='store_true', dest='commit', help='Indicate that the version argument is for a commit or branch') parser.add_argument('-p', '--pull', action='store_true', dest='pull', help='Indicate that the version argument is the number of a github repository pull request') - parser.add_argument('-u', '--url', dest='url', default='https://github.com/monero-project/monero', help='Specify the URL of the repository. Default is %(default)s') + parser.add_argument('-u', '--url', dest='url', default='https://git.wownero.com/wownero/wownero', help='Specify the URL of the repository. Default is %(default)s') parser.add_argument('-v', '--verify', action='store_true', dest='verify', help='Verify the Gitian build') parser.add_argument('-b', '--build', action='store_true', dest='build', help='Do a Gitian build') parser.add_argument('-B', '--buildsign', action='store_true', dest='buildsign', help='Build both signed and unsigned binaries') @@ -178,8 +178,8 @@ def main(): if args.setup: setup() - os.makedirs('builder/inputs/monero', exist_ok=True) - os.chdir('builder/inputs/monero') + os.makedirs('builder/inputs/wownero', exist_ok=True) + os.chdir('builder/inputs/wownero') if args.pull: subprocess.check_call(['git', 'fetch', args.url, 'refs/pull/'+args.version+'/merge']) args.commit = subprocess.check_output(['git', 'show', '-s', '--format=%H', 'FETCH_HEAD'], universal_newlines=True).strip() diff --git a/contrib/gitian/gitian-freebsd.yml b/contrib/gitian/gitian-freebsd.yml index cbc99b39f..83cec75b1 100644 --- a/contrib/gitian/gitian-freebsd.yml +++ b/contrib/gitian/gitian-freebsd.yml @@ -1,5 +1,5 @@ --- -name: "monero-freebsd-0.18" +name: "wownero-freebsd-0.11" enable_cache: true suites: - "bionic" @@ -26,8 +26,8 @@ packages: - "python" - "cmake" remotes: -- "url": "https://github.com/monero-project/monero.git" - "dir": "monero" +- "url": "https://git.wownero.com/wownero/wownero.git" + "dir": "wownero" files: [] script: | @@ -87,7 +87,7 @@ script: | export SOURCE_DATE_EPOCH=`date -d 2000-01-01T12:00:00 +%s` git config --global core.abbrev 9 - cd monero + cd wownero # Set the version string that gets added to the tar archive name version="`git describe`" if [[ $version == *"-"*"-"* ]]; then @@ -119,7 +119,7 @@ script: | chmod 755 bin/* cp ../utils/conf/wow.conf bin chmod 644 bin/wow.conf - DISTNAME=monero-${i}-${version} + DISTNAME=wownero-${i}-${version} mv bin ${DISTNAME} find ${DISTNAME}/ | sort | tar --no-recursion --owner=0 --group=0 -c -T - | bzip2 -9 > ${OUTDIR}/${DISTNAME}.tar.bz2 cd .. diff --git a/contrib/gitian/gitian-linux.yml b/contrib/gitian/gitian-linux.yml index 8c53a15b8..0f72c16ec 100644 --- a/contrib/gitian/gitian-linux.yml +++ b/contrib/gitian/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "monero-linux-0.18" +name: "wownero-linux-0.11" enable_cache: true suites: - "bionic" @@ -38,8 +38,8 @@ packages: - "python" - "cmake" remotes: -- "url": "https://github.com/monero-project/monero.git" - "dir": "monero" +- "url": "https://git.wownero.com/wownero/wownero.git" + "dir": "wownero" files: [] script: | @@ -116,7 +116,7 @@ script: | export SOURCE_DATE_EPOCH=`date -d 2000-01-01T12:00:00 +%s` git config --global core.abbrev 9 - cd monero + cd wownero # Set the version string that gets added to the tar archive name version="`git describe`" if [[ $version == *"-"*"-"* ]]; then @@ -171,7 +171,7 @@ script: | chmod 755 bin/* cp ../utils/conf/wow.conf bin chmod 644 bin/wow.conf - DISTNAME=monero-${i}-${version} + DISTNAME=wownero-${i}-${version} mv bin ${DISTNAME} find ${DISTNAME}/ | sort | tar --no-recursion --owner=0 --group=0 -c -T - | bzip2 -9 > ${OUTDIR}/${DISTNAME}.tar.bz2 cd .. diff --git a/contrib/gitian/gitian-osx.yml b/contrib/gitian/gitian-osx.yml index 365742d9e..7fe03dadf 100644 --- a/contrib/gitian/gitian-osx.yml +++ b/contrib/gitian/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "monero-osx-0.18" +name: "wownero-osx-0.11" enable_cache: true suites: - "bionic" @@ -24,8 +24,8 @@ packages: - "python-dev" - "python-setuptools" remotes: -- "url": "https://github.com/monero-project/monero.git" - "dir": "monero" +- "url": "https://git.wownero.com/wownero/wownero.git" + "dir": "wownero" files: [] script: | WRAP_DIR=$HOME/wrapped @@ -77,7 +77,7 @@ script: | export PATH=${WRAP_DIR}:${PATH} git config --global core.abbrev 9 - cd monero + cd wownero # Set the version string that gets added to the tar archive name version="`git describe`" if [[ $version == *"-"*"-"* ]]; then @@ -110,7 +110,7 @@ script: | chmod 755 bin/* cp ../utils/conf/wow.conf bin chmod 644 bin/wow.conf - DISTNAME=monero-${i}-${version} + DISTNAME=wownero-${i}-${version} mv bin ${DISTNAME} find ${DISTNAME}/ | sort | tar --no-recursion --owner=0 --group=0 -c -T - | bzip2 -9 > ${OUTDIR}/${DISTNAME}.tar.bz2 cd .. diff --git a/contrib/gitian/gitian-win.yml b/contrib/gitian/gitian-win.yml index 37f55380c..992e6edf0 100644 --- a/contrib/gitian/gitian-win.yml +++ b/contrib/gitian/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "monero-win-0.18" +name: "wownero-win-0.11" enable_cache: true suites: - "bionic" @@ -35,8 +35,8 @@ alternatives: package: "x86_64-w64-mingw32-gcc" path: "/usr/bin/x86_64-w64-mingw32-gcc-posix" remotes: -- "url": "https://github.com/monero-project/monero.git" - "dir": "monero" +- "url": "https://git.wownero.com/wownero/wownero.git" + "dir": "wownero" files: [] script: | WRAP_DIR=$HOME/wrapped @@ -91,7 +91,7 @@ script: | export SOURCE_DATE_EPOCH=`date -d 2000-01-01T12:00:00 +%s` git config --global core.abbrev 9 - cd monero + cd wownero # Set the version string that gets added to the tar archive name version="`git describe`" if [[ $version == *"-"*"-"* ]]; then @@ -128,7 +128,7 @@ script: | cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake make ${MAKEOPTS} cp ../utils/conf/wow.conf bin - DISTNAME=monero-${i}-${version} + DISTNAME=wownero-${i}-${version} mv bin ${DISTNAME} find ${DISTNAME}/ | sort | zip -X@ ${OUTDIR}/${DISTNAME}.zip cd .. && rm -rf build