macdeploy: avoid use of `Bitcoin Core` in Linux cross build #33158

fanquake commented at 4:26 PM on August 8, 2025: member

Output bitcoin-macos-app.zip, similar to what we do for Windows: bitcoin-win64-setup.exe.

DrahtBot commented at 4:26 PM on August 8, 2025: contributor

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

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/33158.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	hodlinator, willcl-ark
Concept ACK	jonatack

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

No conflicts as of last run.

jonatack commented at 4:42 PM on August 8, 2025: member

Concept ACK

hodlinator commented at 11:00 PM on August 9, 2025: contributor

Concept ACK

fanquake force-pushed on Aug 11, 2025

achow101 commented at 6:13 PM on August 12, 2025: member

~0

I find it weird that we would produce files named differently for the same target when the hosts are different. Is there a reason that the zip should include the software name in its name anyways?

hodlinator commented at 9:24 AM on August 22, 2025: contributor

Agreed that different names depending on originating platform might be a bit confusing.

Would be slightly more straightforward to switch to bitcoin-macos-app.zip as output for all, or allow -zip without a value in contrib/macdeploy/macdeployqtplus and just produce something like "macdeploy-output.zip".

fanquake force-pushed on Sep 1, 2025

fanquake commented at 3:40 PM on September 1, 2025: member

I find it weird that we would produce files named differently for the same target when the hosts are different Agreed that different names depending on originating platform might be a bit confusing.

I don't mind much, but I don't think the different names are that weird, given the two outputs are different. One is a release-like zip, with an immediately usable binary, the other is a zip containing a binary that wont run, which is immediately renamed, and fed into the codesigning process.

In any case, have changed this to just use bitcoin-macos-app.zip everywhere.

in contrib/macdeploy/macdeployqtplus:496 in 921c6ba251 outdated

 492 | @@ -499,7 +493,14 @@ if platform.system() == "Darwin":
 493 |  # ------------------------------------------------
 494 |  
 495 |  if config.zip is not None:
 496 | -    shutil.make_archive('{}'.format(appname), format='zip', root_dir='dist', base_dir='Bitcoin-Qt.app')
 497 | +

hodlinator commented at 11:43 AM on September 3, 2025:

nit: Please remove empty newline at the beginning of the block if you retouch.

fanquake commented at 12:00 PM on September 3, 2025:

Dropped.

hodlinator approved

hodlinator commented at 11:50 AM on September 3, 2025: contributor

ACK 921c6ba251494b4970025166a3e25cf20789da66

Good to rename osx_volname to macos_zip since it's more modern naming of the OS.

Guix output:

[100%] Generating dist/bitcoin-macos-app.zip
  adding: Bitcoin-Qt.app/ (stored 0%)
  ...
[100%] Built target deploy

Hashes:

f15abfa32b63a5b007d52fb31ac148980570b77cc3be12674debdca65d092706  guix-build-921c6ba25149/output/arm64-apple-darwin/SHA256SUMS.part
b94a1863fff232cdd81f2ad4b729eae9242f80d6493afea6c7c02e871658629f  guix-build-921c6ba25149/output/arm64-apple-darwin/bitcoin-921c6ba25149-arm64-apple-darwin-codesigning.tar.gz
7e4d4cce4247fc4d06b703702c426799a30c64462e49d942e136f873d2a55c1c  guix-build-921c6ba25149/output/arm64-apple-darwin/bitcoin-921c6ba25149-arm64-apple-darwin-unsigned.tar.gz
a643864cc2fc81c982d6204bea72cb102469f5c1899f1c7c27702406306f55af  guix-build-921c6ba25149/output/arm64-apple-darwin/bitcoin-921c6ba25149-arm64-apple-darwin-unsigned.zip
0a20f846fb3d2b40da0e3a7095366924d4ddcda7da4b230a565b3dfc10b9d29d  guix-build-921c6ba25149/output/dist-archive/bitcoin-921c6ba25149.tar.gz
b967e702da3d49301d78b24d3f09b07cecaf62d8ac41cf3020a10831041ce325  guix-build-921c6ba25149/output/x86_64-apple-darwin/SHA256SUMS.part
4dfc8705a3594c21390694b0699035706214c2196af2bf182f3803476244ac23  guix-build-921c6ba25149/output/x86_64-apple-darwin/bitcoin-921c6ba25149-x86_64-apple-darwin-codesigning.tar.gz
5d33e596e741d515d6502840818d0905d46a10c1ad109f244a9bd62f77c423da  guix-build-921c6ba25149/output/x86_64-apple-darwin/bitcoin-921c6ba25149-x86_64-apple-darwin-unsigned.tar.gz
310c8c6dbf58157c1995006e25cc73a2a919cbc558425b23fb36611f9be0ad18  guix-build-921c6ba25149/output/x86_64-apple-darwin/bitcoin-921c6ba25149-x86_64-apple-darwin-unsigned.zip

DrahtBot requested review from jonatack on Sep 3, 2025

macdeploy: combine appname & -zip arguments

appname is only used by -zip.

05353d9cf0

macdeploy: rename macOS output to bitcoin-macos-app.zip

We were naming this "Bitcoin-Core.zip", just to immediately rename it.
Similar to what we do with Windows, i.e `bitcoin-win64-setup.exe`.

8e434a8499

fanquake force-pushed on Sep 3, 2025

hodlinator approved

hodlinator commented at 12:03 PM on September 3, 2025: contributor

re-ACK 8e434a84999c473a7295772a346cbce27888d28e

willcl-ark commented at 1:12 PM on September 24, 2025: member

Guix hashes:

e522b04c6af1759ea97e71c01b55713685ecb0b25557a864a9fa36af26042a8d  guix-build-8e434a84999c/output/arm64-apple-darwin/SHA256SUMS.part
740e33ee5d6d9a9cbc25dc0b4775e108612650b8c644f75adbce00537316abd9  guix-build-8e434a84999c/output/arm64-apple-darwin/bitcoin-8e434a84999c-arm64-apple-darwin-codesigning.tar.gz
bca939a67f3ac36c4345d61ed498d815608b4889a0e2367a2f71273e8f03b605  guix-build-8e434a84999c/output/arm64-apple-darwin/bitcoin-8e434a84999c-arm64-apple-darwin-unsigned.tar.gz
4347c0de606a919f8923946b7f55960498aa9517e25649168dadef2f0ee67f6f  guix-build-8e434a84999c/output/arm64-apple-darwin/bitcoin-8e434a84999c-arm64-apple-darwin-unsigned.zip
a8d4b028bf25b162c9bc89ad68492ee129364721ab70789f578630f71bae9d66  guix-build-8e434a84999c/output/dist-archive/bitcoin-8e434a84999c.tar.gz
9b71793b31e1fdefe374121a3398c51289b80f2a160bacc40aab416423cb029e  guix-build-8e434a84999c/output/x86_64-apple-darwin/SHA256SUMS.part
e30c0a516d949be88c54cb99b6d02a741a5f28a928fc106688aa30720a9ce6fd  guix-build-8e434a84999c/output/x86_64-apple-darwin/bitcoin-8e434a84999c-x86_64-apple-darwin-codesigning.tar.gz
2bd7d35382659c47f5d7f4832a2b2d27623265ffc64079a7b2a21f87686a81ae  guix-build-8e434a84999c/output/x86_64-apple-darwin/bitcoin-8e434a84999c-x86_64-apple-darwin-unsigned.tar.gz
0810727e3fbb856415bb0c5e7df5581959def107178d78cf0b91d05a3c409f98  guix-build-8e434a84999c/output/x86_64-apple-darwin/bitcoin-8e434a84999c-x86_64-apple-darwin-unsigned.zip

willcl-ark approved

willcl-ark commented at 1:17 PM on September 24, 2025: member

ACK 8e434a84999c473a7295772a346cbce27888d28e

Changes here seem good, I also prefer the new naming.

I guess no longer deriving from CLIENT_NAME might affect forks (only if they use this same build/release process?), but the rename in the guix script is currently hardcoded (to Bitcoin-Core.zip), so I doubt this worked for them as-is anyway.

fanquake merged this on Sep 24, 2025

fanquake closed this on Sep 24, 2025

fanquake deleted the branch on Sep 24, 2025