Skip to content

Commit 184159e

Browse files
committed
Merge bitcoin/bitcoin#32922: test: use notarized v28.2 binaries and fix macOS detection
4bb4c86 test: document HOST for get_previous_releases.py (Sjors Provoost) 609203d test: stop signing previous releases >= v28.2 (Sjors Provoost) c6dc2c2 test: replace v28.0 with notarized v28.2 (Sjors Provoost) 5bd73d9 test: fix macOS detection (Sjors Provoost) Pull request description: Since bitcoin/bitcoin#31407 macOS guix builds are signed and notarized. This was included in v29 and backported to 28.x. This PR bumps the v28.0 previous release binary to v28.2 and adjusts the test that uses it. Additionally it no longer manually code signs binaries >= v28.2. While testing on an M4 mac and redownloading all the binaries, I noticed that `platform == "arm64-apple-darwin"` doesn't actually work. This initially used `args.platform` in #26694, but that was changed to just `platform` in #32219. So the first commit switches this to use `args.host`. I manually tested on Intel macOS 13.7.6 that code-signing still isn't needed there (when downloading using a script). Also documented that you can set `HOST`. ACKs for top commit: m3dwards: ACK 4bb4c86 maflcko: review ACK 4bb4c86 🚏 Tree-SHA512: b4803d39a21cb622fd2388a0528b76d2b502956e2505385d3da201143b0afcf6f9d71c8c28937f27b70d2588fb6da677da058bdcd67b90fb53617acc3a727818
2 parents 5d17e64 + 4bb4c86 commit 184159e

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

test/functional/wallet_migration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def setup_nodes(self):
5252
extra_args=self.extra_args,
5353
versions=[
5454
None,
55-
280000,
55+
280200,
5656
],
5757
)
5858
self.start_nodes()

test/get_previous_releases.py

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@
8383
"33930d432593e49d58a9bff4c30078823e9af5d98594d2935862788ce8a20aec": {"tag": "v25.0", "archive": "bitcoin-25.0-x86_64-linux-gnu.tar.gz"},
8484
"7154b35ecc8247589070ae739b7c73c4dee4794bea49eb18dc66faed65b819e7": {"tag": "v25.0", "archive": "bitcoin-25.0-win64.zip"},
8585

86-
"7fa582d99a25c354d23e371a5848bd9e6a79702870f9cbbf1292b86e647d0f4e": {"tag": "v28.0", "archive": "bitcoin-28.0-aarch64-linux-gnu.tar.gz"},
87-
"e004b7910bedd6dd18b6c52b4eef398d55971da666487a82cd48708d2879727e": {"tag": "v28.0", "archive": "bitcoin-28.0-arm-linux-gnueabihf.tar.gz"},
88-
"c8108f30dfcc7ddffab33f5647d745414ef9d3298bfe67d243fe9b9cb4df4c12": {"tag": "v28.0", "archive": "bitcoin-28.0-arm64-apple-darwin.tar.gz"},
89-
"756df50d8f0c2a3d4111389a7be5f4849e0f5014dd5bfcbc37a8c3aaaa54907b": {"tag": "v28.0", "archive": "bitcoin-28.0-powerpc64-linux-gnu.tar.gz"},
90-
"6ee1a520b638132a16725020146abea045db418ce91c02493f02f541cd53062a": {"tag": "v28.0", "archive": "bitcoin-28.0-riscv64-linux-gnu.tar.gz"},
91-
"77e931bbaaf47771a10c376230bf53223f5380864bad3568efc7f4d02e40a0f7": {"tag": "v28.0", "archive": "bitcoin-28.0-x86_64-apple-darwin.tar.gz"},
92-
"7fe294b02b25b51acb8e8e0a0eb5af6bbafa7cd0c5b0e5fcbb61263104a82fbc": {"tag": "v28.0", "archive": "bitcoin-28.0-x86_64-linux-gnu.tar.gz"},
93-
"85282f4ec1bcb0cfe8db0f195e8e0f6fb77cfbe89242a81fff2bc2e9292f7acf": {"tag": "v28.0", "archive": "bitcoin-28.0-win64.zip"},
86+
"10581b6d4aeb091c08c9e69eb4e4ced000038c009286dc1edb8a876656ccf6df": {"tag": "v28.2", "archive": "bitcoin-28.2-aarch64-linux-gnu.tar.gz"},
87+
"c08135c249688438b1ed6f48a2f192ffaae7c7111ffee5cfad59fdae355bb47f": {"tag": "v28.2", "archive": "bitcoin-28.2-arm-linux-gnueabihf.tar.gz"},
88+
"c0270ed50effc174f7ff3332dba5183a8693999dac2ba78b37d8c8797b3ea2b2": {"tag": "v28.2", "archive": "bitcoin-28.2-arm64-apple-darwin.tar.gz"},
89+
"21c54bc7520e873c8b52c817af257a8a4aee15d81bb2492e5bd51af055ae4469": {"tag": "v28.2", "archive": "bitcoin-28.2-powerpc64-linux-gnu.tar.gz"},
90+
"8ad2bf5dd0a7fd04afa9cd2b1309621f8662f00c799f1971cd44ba9eb9d18ef1": {"tag": "v28.2", "archive": "bitcoin-28.2-riscv64-linux-gnu.tar.gz"},
91+
"866a4b703a2095301151c17dcc753e19e4dba61ec68d19709ec4f81ff4320103": {"tag": "v28.2", "archive": "bitcoin-28.2-x86_64-apple-darwin.tar.gz"},
92+
"98add5f220c01b387343b70edeb6273403fe081e22cd85fda132704cdcaa98aa": {"tag": "v28.2", "archive": "bitcoin-28.2-x86_64-linux-gnu.tar.gz"},
93+
"da0869639c323bbf6f264f1829083b9514e10179b90c34b09d8cbcab8a1897e3": {"tag": "v28.2", "archive": "bitcoin-28.2-win64.zip"},
9494
}
9595

9696

@@ -211,8 +211,9 @@ def download_binary(tag, args) -> int:
211211

212212
Path(archive).unlink()
213213

214-
if tag >= "v23" and platform == "arm64-apple-darwin":
215-
# Starting with v23 there are arm64 binaries for ARM (e.g. M1, M2) macs, but they have to be signed to run
214+
if tag >= "v23" and tag < "v28.2" and args.host == "arm64-apple-darwin":
215+
# Starting with v23 there are arm64 binaries for ARM (e.g. M1, M2) mac.
216+
# Until v28.2 they had to be signed to run.
216217
binary_path = f'{os.getcwd()}/{tag}/bin/'
217218

218219
for arm_binary in os.listdir(binary_path):
@@ -284,7 +285,12 @@ def main(args) -> int:
284285

285286
if __name__ == '__main__':
286287
parser = argparse.ArgumentParser(
287-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
288+
formatter_class=argparse.ArgumentDefaultsHelpFormatter,
289+
epilog='''
290+
HOST can be set to any of the `host-platform-triplet`s from
291+
depends/README.md for which a release exists.
292+
''',
293+
)
288294
parser.add_argument('-r', '--remove-dir', action='store_true',
289295
help='remove existing directory.')
290296
parser.add_argument('-t', '--target-dir', action='store',

0 commit comments

Comments
 (0)