From a2b305b42773762713dbb3feb5c2b780cd1f0127 Mon Sep 17 00:00:00 2001 From: MacroFake Date: Mon, 13 Jun 2022 15:23:56 +0200 Subject: [PATCH] Merge bitcoin/bitcoin#25352: test: Fix previous release binary download script for Apple ARM64 5733ae51ceaa9a2c225c43596552b2c918e5334e test: Fix previous release binary download script for Apple ARM64 (Fabian Jahr) Pull request description: The Apple M1 chip binaries at https://bitcoincore.org/bin/bitcoin-core-23.0/ are use `arm64` and not `aarch64` in the file name. This means on my M1 Macbook the v23 binary could not be downloaded: "Binary tag was not found". This changes the script to map the `aarch64` from the host detection to `arm64`. ACKs for top commit: fanquake: ACK 5733ae51ceaa9a2c225c43596552b2c918e5334e Tree-SHA512: bd70c5361c8b549363b11be770ad285f885787ec8781f51a69c1ebbfd08f762ac6ec4d5a92c0d83ce3c8bfb7fc72750c25d42092666d00cc372e62de0f052171 --- test/get_previous_releases.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/get_previous_releases.py b/test/get_previous_releases.py index 19377e7596d7..1a44ffed02a9 100755 --- a/test/get_previous_releases.py +++ b/test/get_previous_releases.py @@ -118,7 +118,7 @@ def download_binary(tag, args) -> int: bin_path = 'releases/download/test.{}'.format( match.group(1), match.group(2)) platform = args.platform - if tag < "v20" and platform in ["x86_64-apple-darwin", "aarch64-apple-darwin"]: + if tag < "v20" and platform in ["x86_64-apple-darwin", "arm64-apple-darwin"]: platform = "osx64" tarball = 'dashcore-{tag}-{platform}.tar.gz'.format( tag=tag[1:], platform=platform) @@ -254,7 +254,7 @@ def check_host(args) -> int: 'aarch64-*-linux*': 'aarch64-linux-gnu', 'x86_64-*-linux*': 'x86_64-linux-gnu', 'x86_64-apple-darwin*': 'x86_64-apple-darwin', - 'aarch64-apple-darwin*': 'aarch64-apple-darwin', + 'aarch64-apple-darwin*': 'arm64-apple-darwin', } args.platform = '' for pattern, target in platforms.items():