guix: Use $HOST instead of generic osx{64} for macOS artifacts #24549

hebasto · 2022-03-13T09:01:12Z

On master (f94784f) and 23.x branches some GUIX artifacts for x86_64 and arm64 macOS have indistinguishable names:

d34646cbaf05e03195eb1e426f72fb471fe2d87ab18c9a656600089597703a38  bitcoin-23.0rc2-arm64-apple-darwin.tar.gz
968767b39442e179e5976b948112a0904374eb4cfb9cba22863408a70a1d99f9  bitcoin-23.0rc2-osx-unsigned.dmg
d8a7037d5bb845a214e45a52abcf9119bfbe72a76d6370e9560c18fda74a70db  bitcoin-23.0rc2-osx-unsigned.tar.gz
71092f37985d556bdd25d33fb8571e13664eacadda90efcf21eaa1ba8a32eabd  bitcoin-23.0rc2-osx-unsigned.dmg
cb10c49b486085b89393955a7a168c32e2f2a4911f2b8d44494bd8f2bd0acf2f  bitcoin-23.0rc2-osx-unsigned.tar.gz
6d4c44726cd45711c4cb7257c6b46731be1446fc85e79ac86f2def19be45ced3  bitcoin-23.0rc2-osx64.tar.gz

With this PR:

$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
054c3765381b6d59c6ad8e5e3cbbdd23e330bd579f88b399f78f296d1a4536d0  guix-build-53dd6165b899/output/arm64-apple-darwin/SHA256SUMS.part
18750c1ff71d014fe5f976da738bfa04a4cd02af6b0d575def8d83160552de2d  guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin-unsigned.dmg
fa2b16684060202d1918c658b446909ee10999a8b9a85018ca2f6a09eaa11c8e  guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin-unsigned.tar.gz
b865000eb4b291a51d1920eec63dcbc9b47dedb1cc7fda0af3ab9b321db36b82  guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin.tar.gz
dd88ce6660754987abf95fc2c4d09f6d2248f12ecee4ef2c03f4fa74bbd8e3ae  guix-build-53dd6165b899/output/dist-archive/bitcoin-53dd6165b899.tar.gz
fb1871c134e079aa970c5317cad258540e2642cc7ff60a794c85651c85fc6fc4  guix-build-53dd6165b899/output/x86_64-apple-darwin/SHA256SUMS.part
b1f4c04f7dbd85798ed7cd76fd7948299dfb5653c6c68df0b0839be1c1b295dd  guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin-unsigned.dmg
f1f8b2774ba3028d6cdde509076614067a6affc0fa176fdbb03829109ae47022  guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin-unsigned.tar.gz
20b9386a81e70f848db7c4f14bcb6cf2fbc1dc17aad1b9a2e6f04ac6fa86a4c9  guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin.tar.gz
6f764a8fe876359d3c377fd934eb6595cc06d746980e07320565566abe9409f9  guix-build-53dd6165b899/output/x86_64-w64-mingw32/SHA256SUMS.part
446b24b2e01608d3dc09db29545db2cdb716c161b19356f4fae930d3ebb299f8  guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-debug.zip
d1660e6839a1358ae2d164958b551b81338cca9b740b3dc314397a35b17ba2a6  guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-setup-unsigned.exe
4ab0d948f3864f0d5d220c570b57a02e040f936a8f6b9dba3b4688c80667def9  guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-unsigned.tar.gz
481177329998fcbb71ab1fc9542a6ffcea623cebddf567981cfa76a7320ec115  guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64.zip

Also naming of Windows artifacts has been improved.

hebasto · 2022-03-13T10:07:15Z

cc @achow101 @dongcarl

Backport to 23.x for rc3?

DrahtBot · 2022-03-14T01:12:11Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#24031 (build: don't compress macOS DMG by fanquake)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

achow101 · 2022-03-14T10:42:11Z

Concept ACK, will test when I get to my guix building machine.

I think we will need to backport this as otherwise the filenames will collide and we will accidentally lose one of the archs when uploading to the download server (all output files are in the same directory rather than split by host as guix outputs).

fanquake · 2022-03-14T17:49:19Z

Concept ACK

gruve-p · 2022-03-15T21:06:16Z

Concept ACK

laanwj · 2022-03-15T21:18:21Z

Code review ACK 933a430

Just ran into this problem while trying to upload the binaries for rc2.

I think we will need to backport this as otherwise the filenames will collide and we will accidentally lose one of the archs when uploading to the download server

Yes. Luckily my move script checks for this eventuality so I noticed.

laanwj · 2022-03-15T21:27:34Z

Looking at the list of files this leaves Windows as the "odd one out" with regard to naming:

bitcoin-23.0rc2-win64-setup.exe
bitcoin-23.0rc2-win64.zip

I'm not sure how important consistency is. If not, I don't think we need to rename them until another processor architecture becomes popular for windows.

Another inconsistency is that windows has -unsigned and (no suffix), while osx has -unsigned and -signed. We might want to reconcile these while we're at it. For the rc2 upload I left out the -signed in the signed dmg name. Fixing it the other way around would be possible too.

This change makes naming of the signed artifacts consistent across different OSes, including Windows.

hebasto · 2022-03-16T06:39:35Z

Another inconsistency is that windows has -unsigned and (no suffix), while osx has -unsigned and -signed. We might want to reconcile these while we're at it. For the rc2 upload I left out the -signed in the signed dmg name. Fixing it the other way around would be possible too.

A dedicated commit has been added.

fanquake · 2022-03-16T10:53:00Z

Guix Build:

bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
c7e2e15aa352da10b269173a224b453adb2871db2327582959f4dd3d6e91b371  guix-build-4b4b04a66d8f/output/arm64-apple-darwin/SHA256SUMS.part
5f673a4cf06036b8eb33ab676e4237204ad2e889d9d977e1866741d61962574c  guix-build-4b4b04a66d8f/output/arm64-apple-darwin/bitcoin-4b4b04a66d8f-arm64-apple-darwin-unsigned.dmg
abbbf4f069b1f53088c11d4fa73919268b3cec1f34e77cb88516cb525ed9c8ef  guix-build-4b4b04a66d8f/output/arm64-apple-darwin/bitcoin-4b4b04a66d8f-arm64-apple-darwin-unsigned.tar.gz
428cd0bf8a3d8c82e2e36cc266100701f22ea73d9313d97c49ed52139e79805b  guix-build-4b4b04a66d8f/output/arm64-apple-darwin/bitcoin-4b4b04a66d8f-arm64-apple-darwin.tar.gz
3cb6adf4c6fb626cd7c15b681bba7bebbfb99844124101b97e77ff07fd3ea667  guix-build-4b4b04a66d8f/output/dist-archive/bitcoin-4b4b04a66d8f.tar.gz
69f6d39783efde46e1a4ec908a4fc368b90c7f2d85fa87f40b054454a77fa84e  guix-build-4b4b04a66d8f/output/x86_64-apple-darwin/SHA256SUMS.part
19e6a4b8625ddce402fc18cc65293b66c362666b1a9355b91699f880a504f612  guix-build-4b4b04a66d8f/output/x86_64-apple-darwin/bitcoin-4b4b04a66d8f-x86_64-apple-darwin-unsigned.dmg
e515163e9b7fbd3554971a4b0601e018e7424f073a5d496a04917ab814d9dfea  guix-build-4b4b04a66d8f/output/x86_64-apple-darwin/bitcoin-4b4b04a66d8f-x86_64-apple-darwin-unsigned.tar.gz
0a803a2624ec8d47b68da3bde2e85f6fa903119a1aebbc1fac583b48de37428e  guix-build-4b4b04a66d8f/output/x86_64-apple-darwin/bitcoin-4b4b04a66d8f-x86_64-apple-darwin.tar.gz
e59f65ce90e082c4bb472d7542cdec6ce8b2c4692934a9fc678bbd6e171ef0a7  guix-build-4b4b04a66d8f/output/x86_64-w64-mingw32/SHA256SUMS.part
0a14e12232b73a0727912b76778e1b4e60ebb10c9bb479c8000ae8d0d6421efc  guix-build-4b4b04a66d8f/output/x86_64-w64-mingw32/bitcoin-4b4b04a66d8f-win-unsigned.tar.gz
bd564d3603df41c09c447e3789b1afce3803f66244e73597f389f90d14a85a78  guix-build-4b4b04a66d8f/output/x86_64-w64-mingw32/bitcoin-4b4b04a66d8f-win64-debug.zip
c2474785fd47d2937df30fe5bd9a07cb78504e6257cc97da2b5eac0359118f0c  guix-build-4b4b04a66d8f/output/x86_64-w64-mingw32/bitcoin-4b4b04a66d8f-win64-setup-unsigned.exe
29880c988297efd35bb51160bdd8afc658cc1b86386f6cd7d101057c2192c167  guix-build-4b4b04a66d8f/output/x86_64-w64-mingw32/bitcoin-4b4b04a66d8f-win64.zip

If we are making changes to make the outputs consistent, we should probably make the unsigned windows tarball win64-unsigned.tar.gz:

bitcoin-4b4b04a66d8f-win-unsigned.tar.gz
bitcoin-4b4b04a66d8f-win64-debug.zip
bitcoin-4b4b04a66d8f-win64-setup-unsigned.exe
bitcoin-4b4b04a66d8f-win64.zip

hebasto · 2022-03-16T11:05:02Z

If we are making changes to make the outputs consistent, we should probably make the unsigned windows tarball win64-unsigned.tar.gz:

bitcoin-4b4b04a66d8f-win-unsigned.tar.gz
bitcoin-4b4b04a66d8f-win64-debug.zip
bitcoin-4b4b04a66d8f-win64-setup-unsigned.exe
bitcoin-4b4b04a66d8f-win64.zip

Fixed.

fanquake · 2022-03-16T15:58:07Z

Guix Build:

bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
054c3765381b6d59c6ad8e5e3cbbdd23e330bd579f88b399f78f296d1a4536d0  guix-build-53dd6165b899/output/arm64-apple-darwin/SHA256SUMS.part
18750c1ff71d014fe5f976da738bfa04a4cd02af6b0d575def8d83160552de2d  guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin-unsigned.dmg
fa2b16684060202d1918c658b446909ee10999a8b9a85018ca2f6a09eaa11c8e  guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin-unsigned.tar.gz
b865000eb4b291a51d1920eec63dcbc9b47dedb1cc7fda0af3ab9b321db36b82  guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin.tar.gz
dd88ce6660754987abf95fc2c4d09f6d2248f12ecee4ef2c03f4fa74bbd8e3ae  guix-build-53dd6165b899/output/dist-archive/bitcoin-53dd6165b899.tar.gz
fb1871c134e079aa970c5317cad258540e2642cc7ff60a794c85651c85fc6fc4  guix-build-53dd6165b899/output/x86_64-apple-darwin/SHA256SUMS.part
b1f4c04f7dbd85798ed7cd76fd7948299dfb5653c6c68df0b0839be1c1b295dd  guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin-unsigned.dmg
f1f8b2774ba3028d6cdde509076614067a6affc0fa176fdbb03829109ae47022  guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin-unsigned.tar.gz
20b9386a81e70f848db7c4f14bcb6cf2fbc1dc17aad1b9a2e6f04ac6fa86a4c9  guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin.tar.gz
6f764a8fe876359d3c377fd934eb6595cc06d746980e07320565566abe9409f9  guix-build-53dd6165b899/output/x86_64-w64-mingw32/SHA256SUMS.part
446b24b2e01608d3dc09db29545db2cdb716c161b19356f4fae930d3ebb299f8  guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-debug.zip
d1660e6839a1358ae2d164958b551b81338cca9b740b3dc314397a35b17ba2a6  guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-setup-unsigned.exe
4ab0d948f3864f0d5d220c570b57a02e040f936a8f6b9dba3b4688c80667def9  guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-unsigned.tar.gz
481177329998fcbb71ab1fc9542a6ffcea623cebddf567981cfa76a7320ec115  guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64.zip

hebasto · 2022-03-16T16:58:10Z

Guix builds in the PR description has been updated.

gruve-p · 2022-03-16T17:12:28Z

ACK 53dd616

achow101 · 2022-03-16T17:17:24Z

054c3765381b6d59c6ad8e5e3cbbdd23e330bd579f88b399f78f296d1a4536d0  guix-build-53dd6165b899/output/arm64-apple-darwin/SHA256SUMS.part
18750c1ff71d014fe5f976da738bfa04a4cd02af6b0d575def8d83160552de2d  guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin-unsigned.dmg
fa2b16684060202d1918c658b446909ee10999a8b9a85018ca2f6a09eaa11c8e  guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin-unsigned.tar.gz
b865000eb4b291a51d1920eec63dcbc9b47dedb1cc7fda0af3ab9b321db36b82  guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin.tar.gz
dd88ce6660754987abf95fc2c4d09f6d2248f12ecee4ef2c03f4fa74bbd8e3ae  guix-build-53dd6165b899/output/dist-archive/bitcoin-53dd6165b899.tar.gz
fb1871c134e079aa970c5317cad258540e2642cc7ff60a794c85651c85fc6fc4  guix-build-53dd6165b899/output/x86_64-apple-darwin/SHA256SUMS.part
b1f4c04f7dbd85798ed7cd76fd7948299dfb5653c6c68df0b0839be1c1b295dd  guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin-unsigned.dmg
f1f8b2774ba3028d6cdde509076614067a6affc0fa176fdbb03829109ae47022  guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin-unsigned.tar.gz
20b9386a81e70f848db7c4f14bcb6cf2fbc1dc17aad1b9a2e6f04ac6fa86a4c9  guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin.tar.gz
6f764a8fe876359d3c377fd934eb6595cc06d746980e07320565566abe9409f9  guix-build-53dd6165b899/output/x86_64-w64-mingw32/SHA256SUMS.part
446b24b2e01608d3dc09db29545db2cdb716c161b19356f4fae930d3ebb299f8  guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-debug.zip
d1660e6839a1358ae2d164958b551b81338cca9b740b3dc314397a35b17ba2a6  guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-setup-unsigned.exe
4ab0d948f3864f0d5d220c570b57a02e040f936a8f6b9dba3b4688c80667def9  guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-unsigned.tar.gz
481177329998fcbb71ab1fc9542a6ffcea623cebddf567981cfa76a7320ec115  guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64.zip

achow101 · 2022-03-16T17:53:09Z

ACK 53dd616

laanwj · 2022-03-16T20:47:41Z

Thanks, post-merge re-ACK.

Github-Pull: bitcoin#24549 Rebased-From: 933a430

This change makes naming of the signed artifacts consistent across different OSes, including Windows. Github-Pull: bitcoin#24549 Rebased-From: 4b4b04a

Github-Pull: bitcoin#24549 Rebased-From: 53dd616

fanquake · 2022-03-16T20:56:16Z

Backported in #24593.

…acOS artifacts 53dd616 guix: Use "win64" for Windows artifacts consistently (Hennadii Stepanov) 4b4b04a guix: Drop "-signed" suffix for signed macOS .dmg files (Hennadii Stepanov) 933a430 guix: Use $HOST instead of generic osx{64} for macOS artifacts (Hennadii Stepanov) Pull request description: On master (f94784f) and 23.x branches some GUIX artifacts for `x86_64` and `arm64` macOS have indistinguishable names: ``` d34646cbaf05e03195eb1e426f72fb471fe2d87ab18c9a656600089597703a38 bitcoin-23.0rc2-arm64-apple-darwin.tar.gz 968767b39442e179e5976b948112a0904374eb4cfb9cba22863408a70a1d99f9 bitcoin-23.0rc2-osx-unsigned.dmg d8a7037d5bb845a214e45a52abcf9119bfbe72a76d6370e9560c18fda74a70db bitcoin-23.0rc2-osx-unsigned.tar.gz 71092f37985d556bdd25d33fb8571e13664eacadda90efcf21eaa1ba8a32eabd bitcoin-23.0rc2-osx-unsigned.dmg cb10c49b486085b89393955a7a168c32e2f2a4911f2b8d44494bd8f2bd0acf2f bitcoin-23.0rc2-osx-unsigned.tar.gz 6d4c44726cd45711c4cb7257c6b46731be1446fc85e79ac86f2def19be45ced3 bitcoin-23.0rc2-osx64.tar.gz ``` With this PR: ``` $ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum 054c3765381b6d59c6ad8e5e3cbbdd23e330bd579f88b399f78f296d1a4536d0 guix-build-53dd6165b899/output/arm64-apple-darwin/SHA256SUMS.part 18750c1ff71d014fe5f976da738bfa04a4cd02af6b0d575def8d83160552de2d guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin-unsigned.dmg fa2b16684060202d1918c658b446909ee10999a8b9a85018ca2f6a09eaa11c8e guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin-unsigned.tar.gz b865000eb4b291a51d1920eec63dcbc9b47dedb1cc7fda0af3ab9b321db36b82 guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin.tar.gz dd88ce6660754987abf95fc2c4d09f6d2248f12ecee4ef2c03f4fa74bbd8e3ae guix-build-53dd6165b899/output/dist-archive/bitcoin-53dd6165b899.tar.gz fb1871c134e079aa970c5317cad258540e2642cc7ff60a794c85651c85fc6fc4 guix-build-53dd6165b899/output/x86_64-apple-darwin/SHA256SUMS.part b1f4c04f7dbd85798ed7cd76fd7948299dfb5653c6c68df0b0839be1c1b295dd guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin-unsigned.dmg f1f8b2774ba3028d6cdde509076614067a6affc0fa176fdbb03829109ae47022 guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin-unsigned.tar.gz 20b9386a81e70f848db7c4f14bcb6cf2fbc1dc17aad1b9a2e6f04ac6fa86a4c9 guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin.tar.gz 6f764a8fe876359d3c377fd934eb6595cc06d746980e07320565566abe9409f9 guix-build-53dd6165b899/output/x86_64-w64-mingw32/SHA256SUMS.part 446b24b2e01608d3dc09db29545db2cdb716c161b19356f4fae930d3ebb299f8 guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-debug.zip d1660e6839a1358ae2d164958b551b81338cca9b740b3dc314397a35b17ba2a6 guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-setup-unsigned.exe 4ab0d948f3864f0d5d220c570b57a02e040f936a8f6b9dba3b4688c80667def9 guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-unsigned.tar.gz 481177329998fcbb71ab1fc9542a6ffcea623cebddf567981cfa76a7320ec115 guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64.zip ``` Also naming of Windows artifacts has been improved. ACKs for top commit: gruve-p: ACK bitcoin@53dd616 achow101: ACK 53dd616 Tree-SHA512: 2a60d8b33608aa18b8bc4376eccca813e482571138524b9e3f8f7ab9a085df79faa1f05bc6e07bbfaf01ddd7a3d17172a6061162ab055fb51ea01e8ccf3e4422

61c0216 doc, guix: Include arm64-apple-darwin into codesigned archs (Hennadii Stepanov) f541a25 doc: Drop a note about Intel-based Macs (Hennadii Stepanov) dd2c7f7 guix: Use "win64" for Windows artifacts consistently (Hennadii Stepanov) 2e7cde8 guix: Drop "-signed" suffix for signed macOS .dmg files (Hennadii Stepanov) 7f6420c guix: Use $HOST instead of generic osx{64} for macOS artifacts (Hennadii Stepanov) de52879 Update signapple for platform identifier fix (Andrew Chow) Pull request description: Backports: * #24549 * #24573 * #24588 * #24597 ACKs for top commit: laanwj: Code review ACK 61c0216 Tree-SHA512: 023bfe6f1a31cec66f0255fb8e9c186f44a50a900a9f22c65b2da672b413fec7570f0f11626317344b6f91e74610006ffe0e35243af510de1eb8a3ceb8e8d37f

…t exist" 7762c56 build: Fix "ERR: Unsigned tarballs do not exist" (Hennadii Stepanov) Pull request description: This was missed in 53dd616 (bitcoin/bitcoin#24549). ACKs for top commit: laanwj: ACK 7762c56 fanquake: ACK 7762c56 - this should have been a part of #24549. Tree-SHA512: 526e4e6ee1463003059b9703030c5b0537445783c45a205024c9c9e3493da967733153a1dc80594fed15a336805c1cf14c8d13cd106186a7544f51d0d542f335

7762c56 build: Fix "ERR: Unsigned tarballs do not exist" (Hennadii Stepanov) Pull request description: This was missed in 53dd616 (bitcoin#24549). ACKs for top commit: laanwj: ACK 7762c56 fanquake: ACK 7762c56 - this should have been a part of bitcoin#24549. Tree-SHA512: 526e4e6ee1463003059b9703030c5b0537445783c45a205024c9c9e3493da967733153a1dc80594fed15a336805c1cf14c8d13cd106186a7544f51d0d542f335

…acOS artifacts 53dd616 guix: Use "win64" for Windows artifacts consistently (Hennadii Stepanov) 4b4b04a guix: Drop "-signed" suffix for signed macOS .dmg files (Hennadii Stepanov) 933a430 guix: Use $HOST instead of generic osx{64} for macOS artifacts (Hennadii Stepanov) Pull request description: On master (f94784f) and 23.x branches some GUIX artifacts for `x86_64` and `arm64` macOS have indistinguishable names: ``` d34646cbaf05e03195eb1e426f72fb471fe2d87ab18c9a656600089597703a38 bitcoin-23.0rc2-arm64-apple-darwin.tar.gz 968767b39442e179e5976b948112a0904374eb4cfb9cba22863408a70a1d99f9 bitcoin-23.0rc2-osx-unsigned.dmg d8a7037d5bb845a214e45a52abcf9119bfbe72a76d6370e9560c18fda74a70db bitcoin-23.0rc2-osx-unsigned.tar.gz 71092f37985d556bdd25d33fb8571e13664eacadda90efcf21eaa1ba8a32eabd bitcoin-23.0rc2-osx-unsigned.dmg cb10c49b486085b89393955a7a168c32e2f2a4911f2b8d44494bd8f2bd0acf2f bitcoin-23.0rc2-osx-unsigned.tar.gz 6d4c44726cd45711c4cb7257c6b46731be1446fc85e79ac86f2def19be45ced3 bitcoin-23.0rc2-osx64.tar.gz ``` With this PR: ``` $ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum 054c3765381b6d59c6ad8e5e3cbbdd23e330bd579f88b399f78f296d1a4536d0 guix-build-53dd6165b899/output/arm64-apple-darwin/SHA256SUMS.part 18750c1ff71d014fe5f976da738bfa04a4cd02af6b0d575def8d83160552de2d guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin-unsigned.dmg fa2b16684060202d1918c658b446909ee10999a8b9a85018ca2f6a09eaa11c8e guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin-unsigned.tar.gz b865000eb4b291a51d1920eec63dcbc9b47dedb1cc7fda0af3ab9b321db36b82 guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin.tar.gz dd88ce6660754987abf95fc2c4d09f6d2248f12ecee4ef2c03f4fa74bbd8e3ae guix-build-53dd6165b899/output/dist-archive/bitcoin-53dd6165b899.tar.gz fb1871c134e079aa970c5317cad258540e2642cc7ff60a794c85651c85fc6fc4 guix-build-53dd6165b899/output/x86_64-apple-darwin/SHA256SUMS.part b1f4c04f7dbd85798ed7cd76fd7948299dfb5653c6c68df0b0839be1c1b295dd guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin-unsigned.dmg f1f8b2774ba3028d6cdde509076614067a6affc0fa176fdbb03829109ae47022 guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin-unsigned.tar.gz 20b9386a81e70f848db7c4f14bcb6cf2fbc1dc17aad1b9a2e6f04ac6fa86a4c9 guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin.tar.gz 6f764a8fe876359d3c377fd934eb6595cc06d746980e07320565566abe9409f9 guix-build-53dd6165b899/output/x86_64-w64-mingw32/SHA256SUMS.part 446b24b2e01608d3dc09db29545db2cdb716c161b19356f4fae930d3ebb299f8 guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-debug.zip d1660e6839a1358ae2d164958b551b81338cca9b740b3dc314397a35b17ba2a6 guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-setup-unsigned.exe 4ab0d948f3864f0d5d220c570b57a02e040f936a8f6b9dba3b4688c80667def9 guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-unsigned.tar.gz 481177329998fcbb71ab1fc9542a6ffcea623cebddf567981cfa76a7320ec115 guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64.zip ``` Also naming of Windows artifacts has been improved. ACKs for top commit: gruve-p: ACK bitcoin@53dd616 achow101: ACK 53dd616 Tree-SHA512: 2a60d8b33608aa18b8bc4376eccca813e482571138524b9e3f8f7ab9a085df79faa1f05bc6e07bbfaf01ddd7a3d17172a6061162ab055fb51ea01e8ccf3e4422

fanquake added Build system macOS labels Mar 13, 2022

guix: Use $HOST instead of generic osx{64} for macOS artifacts

933a430

hebasto force-pushed the 220313-arm64 branch from 099c6e1 to 933a430 Compare March 13, 2022 10:05

hebasto marked this pull request as ready for review March 13, 2022 10:06

DrahtBot mentioned this pull request Mar 14, 2022

build: don't compress macOS DMG #24031

Merged

achow101 requested a review from fanquake March 14, 2022 10:42

achow101 added this to the 23.0 milestone Mar 14, 2022

fanquake added the Needs backport (23.x) label Mar 14, 2022

guix: Drop "-signed" suffix for signed macOS .dmg files

4b4b04a

This change makes naming of the signed artifacts consistent across different OSes, including Windows.

guix: Use "win64" for Windows artifacts consistently

53dd616

fanquake merged commit d6cb4e8 into bitcoin:master Mar 16, 2022

fanquake pushed a commit to fanquake/bitcoin that referenced this pull request Mar 16, 2022

guix: Use $HOST instead of generic osx{64} for macOS artifacts

7f6420c

Github-Pull: bitcoin#24549 Rebased-From: 933a430

fanquake pushed a commit to fanquake/bitcoin that referenced this pull request Mar 16, 2022

guix: Use "win64" for Windows artifacts consistently

dd2c7f7

Github-Pull: bitcoin#24549 Rebased-From: 53dd616

fanquake mentioned this pull request Mar 16, 2022

[23.x] macOS / build backports #24593

Merged

fanquake removed the Needs backport (23.x) label Mar 16, 2022

hebasto deleted the 220313-arm64 branch March 17, 2022 06:09

hebasto mentioned this pull request Apr 1, 2022

build: Fix "ERR: Unsigned tarballs do not exist" #24733

Merged

bitcoin locked and limited conversation to collaborators Mar 17, 2023

guix: Use $HOST instead of generic osx{64} for macOS artifacts #24549

guix: Use $HOST instead of generic osx{64} for macOS artifacts #24549

Uh oh!

Conversation

hebasto commented Mar 13, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hebasto commented Mar 13, 2022

Uh oh!

DrahtBot commented Mar 14, 2022

Conflicts

Uh oh!

achow101 commented Mar 14, 2022

Uh oh!

fanquake commented Mar 14, 2022

Uh oh!

gruve-p commented Mar 15, 2022

Uh oh!

laanwj commented Mar 15, 2022

Uh oh!

laanwj commented Mar 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hebasto commented Mar 16, 2022

Uh oh!

fanquake commented Mar 16, 2022

Uh oh!

hebasto commented Mar 16, 2022

Uh oh!

fanquake commented Mar 16, 2022

Uh oh!

hebasto commented Mar 16, 2022

Uh oh!

gruve-p commented Mar 16, 2022

Uh oh!

achow101 commented Mar 16, 2022

Uh oh!

achow101 commented Mar 16, 2022

Uh oh!

laanwj commented Mar 16, 2022

Uh oh!

fanquake commented Mar 16, 2022

Uh oh!

Uh oh!

hebasto commented Mar 13, 2022 •

edited

Loading

laanwj commented Mar 15, 2022 •

edited

Loading