sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: dashification of test/get_previous_releases.py

Browse Source
This commit is contained in:
Konstantin Akimov 2023-06-12 19:24:47 +07:00 committed by PastaPastaPasta
parent a3684885e9
commit 8a9712e75b
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ci/dash/test_integrationtests.sh
View File

@ -20,6 +20,11 @@ fi
export LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib export LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib
if [ -n "$PREVIOUS_RELEASES_TO_DOWNLOAD" ]; then
echo "Downloading previous releases: $PREVIOUS_RELEASES_TO_DOWNLOAD"
./test/get_previous_releases.py -b -t "$PREVIOUS_RELEASES_DIR" ${PREVIOUS_RELEASES_TO_DOWNLOAD}
fi
cd build-ci/dashcore-$BUILD_TARGET cd build-ci/dashcore-$BUILD_TARGET
if [ "$SOCKETEVENTS" = "" ]; then if [ "$SOCKETEVENTS" = "" ]; then

20
test/get_previous_releases.py
View File

@ -79,14 +79,14 @@ def download_binary(tag, args) -> int:
return 0 return 0
shutil.rmtree(tag) shutil.rmtree(tag)
Path(tag).mkdir() Path(tag).mkdir()
bin_path = 'bin/bitcoin-core-{}'.format(tag[1:]) bin_path = 'releases/download/v{}'.format(tag[1:])
match = re.compile('v(.*)(rc[0-9]+)$').search(tag) match = re.compile('v(.*)(rc[0-9]+)$').search(tag)
if match: if match:
bin_path = 'bin/bitcoin-core-{}/test.{}'.format( bin_path = 'releases/download/test.{}'.format(
match.group(1), match.group(2)) match.group(1), match.group(2))
tarball = 'bitcoin-{tag}-{platform}.tar.gz'.format( tarball = 'dashcore-{tag}-{platform}.tar.gz'.format(
tag=tag[1:], platform=args.platform) tag=tag[1:], platform=args.platform)
tarballUrl = 'https://bitcoincore.org/{bin_path}/{tarball}'.format( tarballUrl = 'https://github.com/dashpay/dash/{bin_path}/{tarball}'.format(
bin_path=bin_path, tarball=tarball) bin_path=bin_path, tarball=tarball)
print('Fetching: {tarballUrl}'.format(tarballUrl=tarballUrl)) print('Fetching: {tarballUrl}'.format(tarballUrl=tarballUrl))
@ -98,7 +98,7 @@ def download_binary(tag, args) -> int:
return 1 return 1
curlCmds = [ curlCmds = [
['curl', '--remote-name', tarballUrl] ['curl', '-L', '--remote-name', tarballUrl]
] ]
for cmd in curlCmds: for cmd in curlCmds:
@ -121,9 +121,11 @@ def download_binary(tag, args) -> int:
print("Checksum matched") print("Checksum matched")
# Extract tarball # Extract tarball
# special case for v17 and earlier: other name of version
filename = tag[1:-2] if tag[1:3] == "0." else tag[1:]
ret = subprocess.run(['tar', '-zxf', tarball, '-C', tag, ret = subprocess.run(['tar', '-zxf', tarball, '-C', tag,
'--strip-components=1', '--strip-components=1',
'bitcoin-{tag}'.format(tag=tag[1:])]).returncode 'dashcore-{tag}'.format(tag=filename, platform=args.platform)]).returncode
if ret: if ret:
return ret return ret
@ -132,7 +134,7 @@ def download_binary(tag, args) -> int:
def build_release(tag, args) -> int: def build_release(tag, args) -> int:
githubUrl = "https://github.com/bitcoin/bitcoin" githubUrl = "https://github.com/dashpay/dash"
if args.remove_dir: if args.remove_dir:
if Path(tag).is_dir(): if Path(tag).is_dir():
shutil.rmtree(tag) shutil.rmtree(tag)
@ -176,7 +178,7 @@ def build_release(tag, args) -> int:
# Move binaries, so they're in the same place as in the # Move binaries, so they're in the same place as in the
# release download # release download
Path('bin').mkdir(exist_ok=True) Path('bin').mkdir(exist_ok=True)
files = ['bitcoind', 'bitcoin-cli', 'bitcoin-tx'] files = ['dashd', 'dash-cli', 'dash-tx']
for f in files: for f in files:
Path('src/'+f).rename('bin/'+f) Path('src/'+f).rename('bin/'+f)
return 0 return 0
@ -236,6 +238,6 @@ if __name__ == '__main__':
parser.add_argument('-t', '--target-dir', action='store', parser.add_argument('-t', '--target-dir', action='store',
help='target directory.', default='releases') help='target directory.', default='releases')
parser.add_argument('tags', nargs='+', parser.add_argument('tags', nargs='+',
help="release tags. e.g.: v0.18.1 v0.20.0rc2") help="release tags. e.g.: v19.1.0 v19.0.0-rc.9")
args = parser.parse_args() args = parser.parse_args()
sys.exit(main(args)) sys.exit(main(args))