Skip to content

Commit 3340d46

Browse files
author
MacroFake
committed
Merge bitcoin/bitcoin#25352: test: Fix previous release binary download script for Apple ARM64
5733ae5 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 5733ae5 Tree-SHA512: bd70c5361c8b549363b11be770ad285f885787ec8781f51a69c1ebbfd08f762ac6ec4d5a92c0d83ce3c8bfb7fc72750c25d42092666d00cc372e62de0f052171
2 parents 5174a13 + 5733ae5 commit 3340d46

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

test/get_previous_releases.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def download_binary(tag, args) -> int:
106106
bin_path = 'bin/bitcoin-core-{}/test.{}'.format(
107107
match.group(1), match.group(2))
108108
platform = args.platform
109-
if tag < "v23" and platform in ["x86_64-apple-darwin", "aarch64-apple-darwin"]:
109+
if tag < "v23" and platform in ["x86_64-apple-darwin", "arm64-apple-darwin"]:
110110
platform = "osx64"
111111
tarball = 'bitcoin-{tag}-{platform}.tar.gz'.format(
112112
tag=tag[1:], platform=platform)
@@ -214,7 +214,7 @@ def check_host(args) -> int:
214214
'aarch64-*-linux*': 'aarch64-linux-gnu',
215215
'x86_64-*-linux*': 'x86_64-linux-gnu',
216216
'x86_64-apple-darwin*': 'x86_64-apple-darwin',
217-
'aarch64-apple-darwin*': 'aarch64-apple-darwin',
217+
'aarch64-apple-darwin*': 'arm64-apple-darwin',
218218
}
219219
args.platform = ''
220220
for pattern, target in platforms.items():

0 commit comments

Comments
 (0)