Merge bitcoin/bitcoin#25352: test: Fix previous release binary download script for Apple ARM64

5733ae51ce 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 5733ae51ce

Tree-SHA512: bd70c5361c8b549363b11be770ad285f885787ec8781f51a69c1ebbfd08f762ac6ec4d5a92c0d83ce3c8bfb7fc72750c25d42092666d00cc372e62de0f052171
This commit is contained in:
MacroFake 2022-06-13 15:23:56 +02:00
commit 3340d46cd3
No known key found for this signature in database
GPG key ID: CE2B75697E69A548

View file

@ -106,7 +106,7 @@ def download_binary(tag, args) -> int:
bin_path = 'bin/bitcoin-core-{}/test.{}'.format(
match.group(1), match.group(2))
platform = args.platform
if tag < "v23" and platform in ["x86_64-apple-darwin", "aarch64-apple-darwin"]:
if tag < "v23" and platform in ["x86_64-apple-darwin", "arm64-apple-darwin"]:
platform = "osx64"
tarball = 'bitcoin-{tag}-{platform}.tar.gz'.format(
tag=tag[1:], platform=platform)
@ -214,7 +214,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():