From c590033558bfa93d6b45f18b6fe7f28070b67574 Mon Sep 17 00:00:00 2001 From: qvqc Date: Sat, 29 Aug 2020 13:22:16 -0400 Subject: [PATCH 1/4] update git url for deterministic test --- contrib/gitian/gitian-android.yml | 2 +- contrib/gitian/gitian-build.py | 2 +- contrib/gitian/gitian-freebsd.yml | 2 +- contrib/gitian/gitian-linux.yml | 2 +- contrib/gitian/gitian-osx.yml | 2 +- contrib/gitian/gitian-win.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/gitian/gitian-android.yml b/contrib/gitian/gitian-android.yml index c47d17337..6c542e0ec 100644 --- a/contrib/gitian/gitian-android.yml +++ b/contrib/gitian/gitian-android.yml @@ -32,7 +32,7 @@ packages: - "python3-zmq" - "unzip" remotes: -- "url": "https://github.com/wownero/wownero.git" +- "url": "https://git.wownero.com/qvqc/wownero.git" "dir": "wownero" files: [] script: | diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py index 07b052b1c..dfdb7ee79 100755 --- a/contrib/gitian/gitian-build.py +++ b/contrib/gitian/gitian-build.py @@ -118,7 +118,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/wownero/wownero', help='Specify the URL of the repository. Default is %(default)s') + parser.add_argument('-u', '--url', dest='url', default='https://git.wownero.com/qvqc/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') diff --git a/contrib/gitian/gitian-freebsd.yml b/contrib/gitian/gitian-freebsd.yml index 8670ce095..f4b625b3c 100644 --- a/contrib/gitian/gitian-freebsd.yml +++ b/contrib/gitian/gitian-freebsd.yml @@ -32,7 +32,7 @@ packages: - "libprotobuf-dev" - "python3-zmq" remotes: -- "url": "https://github.com/wownero/wownero.git" +- "url": "https://git.wownero.com/qvqc/wownero.git" "dir": "wownero" files: [] script: | diff --git a/contrib/gitian/gitian-linux.yml b/contrib/gitian/gitian-linux.yml index 164e1637a..215870ba9 100644 --- a/contrib/gitian/gitian-linux.yml +++ b/contrib/gitian/gitian-linux.yml @@ -43,7 +43,7 @@ packages: - "libprotobuf-dev" - "python3-zmq" remotes: -- "url": "https://github.com/wownero/wownero.git" +- "url": "https://git.wownero.com/qvqc/wownero.git" "dir": "wownero" files: [] script: | diff --git a/contrib/gitian/gitian-osx.yml b/contrib/gitian/gitian-osx.yml index 7488c417b..9178e9868 100644 --- a/contrib/gitian/gitian-osx.yml +++ b/contrib/gitian/gitian-osx.yml @@ -24,7 +24,7 @@ packages: - "python-dev" - "python-setuptools" remotes: -- "url": "https://github.com/wownero/wownero.git" +- "url": "https://git.wownero.com/qvqc/wownero.git" "dir": "wownero" files: - "MacOSX10.11.sdk.tar.gz" diff --git a/contrib/gitian/gitian-win.yml b/contrib/gitian/gitian-win.yml index 5ad37b0c3..cbbdbb143 100644 --- a/contrib/gitian/gitian-win.yml +++ b/contrib/gitian/gitian-win.yml @@ -36,7 +36,7 @@ alternatives: package: "x86_64-w64-mingw32-gcc" path: "/usr/bin/x86_64-w64-mingw32-gcc-posix" remotes: -- "url": "https://github.com/wownero/wownero.git" +- "url": "https://git.wownero.com/qvqc/wownero.git" "dir": "wownero" files: [] script: | From 9e9e4b8485752dd837fd258c4306d963692d22d5 Mon Sep 17 00:00:00 2001 From: qvqc Date: Sat, 29 Aug 2020 13:47:52 -0400 Subject: [PATCH 2/4] couple more :3 --- contrib/gitian/gitian-build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py index dfdb7ee79..03dae9eff 100755 --- a/contrib/gitian/gitian-build.py +++ b/contrib/gitian/gitian-build.py @@ -5,8 +5,8 @@ import os import subprocess import sys -gsigs = 'https://github.com/wownero/gitian.sigs.git' -gbrepo = 'https://github.com/wownero/gitian-builder.git' +gsigs = 'https://git.wownero.com/qvqc/gitian.sigs.git' +gbrepo = 'https://git.wownero.com/qvqc/gitian-builder.git' platforms = {'l': ['Linux', 'linux', 'tar.bz2'], 'a': ['Android', 'android', 'tar.bz2'], From 45142e0ecb4193f66550afb57544f6e5b9124e2d Mon Sep 17 00:00:00 2001 From: selsta Date: Thu, 20 Aug 2020 02:58:04 +0200 Subject: [PATCH 3/4] depends: fix broken links for ds_store / mac_alias --- contrib/depends/packages/native_ds_store.mk | 8 ++++---- contrib/depends/packages/native_mac_alias.mk | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/depends/packages/native_ds_store.mk b/contrib/depends/packages/native_ds_store.mk index 49f5829ac..f0c617659 100644 --- a/contrib/depends/packages/native_ds_store.mk +++ b/contrib/depends/packages/native_ds_store.mk @@ -1,9 +1,9 @@ package=native_ds_store $(package)_version=1.1.0 -$(package)_download_path=https://bitbucket.org/al45tair/ds_store/get -$(package)_download_file=v$($(package)_version).tar.bz2 -$(package)_file_name=$(package)-$($(package)_version).tar.bz2 -$(package)_sha256_hash=921596764d71d1bbd3297a90ef6d286f718794d667e4f81d91d14053525d64c1 +$(package)_download_path=https://github.com/al45tair/ds_store/archive/ +$(package)_download_file=v$($(package)_version).tar.gz +$(package)_file_name=$(package)-$($(package)_version).tar.gz +$(package)_sha256_hash=a9f4c0755c6be7224ff7029e188dd262e830bb81e801424841db9eb0780ec8ed $(package)_install_libdir=$(build_prefix)/lib/python/dist-packages $(package)_dependencies=native_biplist diff --git a/contrib/depends/packages/native_mac_alias.mk b/contrib/depends/packages/native_mac_alias.mk index 85a8a402b..48bd90fb6 100644 --- a/contrib/depends/packages/native_mac_alias.mk +++ b/contrib/depends/packages/native_mac_alias.mk @@ -1,9 +1,9 @@ package=native_mac_alias $(package)_version=1.1.0 -$(package)_download_path=https://bitbucket.org/al45tair/mac_alias/get -$(package)_download_file=v$($(package)_version).tar.bz2 -$(package)_file_name=$(package)-$($(package)_version).tar.bz2 -$(package)_sha256_hash=87ad827e66790028361e43fc754f68ed041a9bdb214cca03c853f079b04fb120 +$(package)_download_path=https://github.com/al45tair/mac_alias/archive/ +$(package)_download_file=v$($(package)_version).tar.gz +$(package)_file_name=$(package)-$($(package)_version).tar.gz +$(package)_sha256_hash=b10cb44ecb64fc25283fae7a9cf365d2829377d84e37b9c21100aca8757509be $(package)_install_libdir=$(build_prefix)/lib/python/dist-packages $(package)_patches=python3.patch From 51bf95597d0c17f4143a16ed22d246507bed3134 Mon Sep 17 00:00:00 2001 From: qvqc Date: Sun, 30 Aug 2020 16:08:06 -0400 Subject: [PATCH 4/4] use wownero/wownero git --- contrib/gitian/gitian-build.py | 2 +- contrib/gitian/gitian-freebsd.yml | 2 +- contrib/gitian/gitian-linux.yml | 4 ++-- contrib/gitian/gitian-osx.yml | 2 +- contrib/gitian/gitian-win.yml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py index 03dae9eff..58d1e3f70 100755 --- a/contrib/gitian/gitian-build.py +++ b/contrib/gitian/gitian-build.py @@ -118,7 +118,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://git.wownero.com/qvqc/wownero', 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') diff --git a/contrib/gitian/gitian-freebsd.yml b/contrib/gitian/gitian-freebsd.yml index f4b625b3c..61d030f58 100644 --- a/contrib/gitian/gitian-freebsd.yml +++ b/contrib/gitian/gitian-freebsd.yml @@ -32,7 +32,7 @@ packages: - "libprotobuf-dev" - "python3-zmq" remotes: -- "url": "https://git.wownero.com/qvqc/wownero.git" +- "url": "https://git.wownero.com/wownero/wownero.git" "dir": "wownero" files: [] script: | diff --git a/contrib/gitian/gitian-linux.yml b/contrib/gitian/gitian-linux.yml index 215870ba9..36406dbbb 100644 --- a/contrib/gitian/gitian-linux.yml +++ b/contrib/gitian/gitian-linux.yml @@ -43,13 +43,13 @@ packages: - "libprotobuf-dev" - "python3-zmq" remotes: -- "url": "https://git.wownero.com/qvqc/wownero.git" +- "url": "https://git.wownero.com/wownero/wownero.git" "dir": "wownero" files: [] script: | WRAP_DIR=$HOME/wrapped - HOSTS="x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu i686-linux-gnu" + HOSTS="x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu" FAKETIME_HOST_PROGS="" FAKETIME_PROGS="date" HOST_CFLAGS="-O2 -g" diff --git a/contrib/gitian/gitian-osx.yml b/contrib/gitian/gitian-osx.yml index 9178e9868..59caab9bb 100644 --- a/contrib/gitian/gitian-osx.yml +++ b/contrib/gitian/gitian-osx.yml @@ -24,7 +24,7 @@ packages: - "python-dev" - "python-setuptools" remotes: -- "url": "https://git.wownero.com/qvqc/wownero.git" +- "url": "https://git.wownero.com/wownero/wownero.git" "dir": "wownero" files: - "MacOSX10.11.sdk.tar.gz" diff --git a/contrib/gitian/gitian-win.yml b/contrib/gitian/gitian-win.yml index cbbdbb143..4a7928998 100644 --- a/contrib/gitian/gitian-win.yml +++ b/contrib/gitian/gitian-win.yml @@ -36,12 +36,12 @@ alternatives: package: "x86_64-w64-mingw32-gcc" path: "/usr/bin/x86_64-w64-mingw32-gcc-posix" remotes: -- "url": "https://git.wownero.com/qvqc/wownero.git" +- "url": "https://git.wownero.com/wownero/wownero.git" "dir": "wownero" files: [] script: | WRAP_DIR=$HOME/wrapped - HOSTS="i686-w64-mingw32 x86_64-w64-mingw32" + HOSTS="x86_64-w64-mingw32" FAKETIME_HOST_PROGS="windres objcopy" FAKETIME_PROGS="date zip" HOST_CFLAGS="-O2 -g"