build: produce a .zip for macOS distribution

fanquake commented at 4:04 pm on February 14, 2023: member

Reviving the discussion around using a .zip for the distributed macOS binaries, as opposed to a .dmg.

Given we only had a single report of the “no finder window” issue (#26176), I wonder if that means macOS users were able to figure it out, they gave up/didn’t report, or, we just have very few macOS users.

Related to #18128.

fanquake added the label Brainstorming on Feb 14, 2023

fanquake added the label macOS on Feb 14, 2023

DrahtBot commented at 4:04 pm on February 14, 2023: contributor

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

Reviews

See the guideline for information on the review process.

Type	Reviewers
Concept ACK	prusnak, RandyMcMillan, dergoegge
Stale ACK	Sjors

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

#25573 ([POC] guix: produce a fully -static-pie bitcoind by fanquake)
#25391 (guix: Use LTO to build releases by fanquake)
#24123 (build: Pointer Authentication and Branch Target Identification for aarch64 Linux (Guix) by fanquake)
#21778 (build: LLD based macOS toolchain 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.

prusnak commented at 5:10 pm on February 14, 2023: contributor

Concept ACK

At present, the user experience with DMG is terrible (as noted in this issue: #26176). If there’s no straightforward solution on the horizon, it would be best to switch to using ZIP instead. Using DMG without a Finder window provides no advantages and only leads to a lot of confusion. As evidence, Visual Studio Code has recently started distributing their macOS builds as ZIP files instead of DMGs, as you can see on their download page: https://code.visualstudio.com/Download.

RandyMcMillan commented at 9:00 pm on February 14, 2023: contributor

Concept ACK

tested on macOS 12.6.1 (21G217) Python 3.10.9 tested on macOS 10.15.7 (19H2026) Python 3.10.9

Sjors commented at 10:38 am on February 15, 2023: member

Concept ACK, I second @prusnak.

dergoegge commented at 5:24 pm on February 28, 2023: member

Concept ACK

DrahtBot added the label Needs rebase on Mar 1, 2023

fanquake force-pushed on Mar 1, 2023

fanquake commented at 8:26 pm on March 1, 2023: member

Rebased past #27172.

DrahtBot removed the label Needs rebase on Mar 1, 2023

fanquake force-pushed on Mar 3, 2023

fanquake marked this as ready for review on Mar 3, 2023

fanquake commented at 2:33 pm on March 3, 2023: member

A few Concept ACKs here, so have rebased and undrafted.

Sjors commented at 12:22 pm on March 30, 2023: member

This is definitely nicer. When you doubleclick on the zip file it magically reveals the orange icon:

The only thing we need to remind the user of, is to drag it to their applications folder. Worst case: they forget, sync a node, delete everything in the download folder. This won’t delete the blockchain or their wallet, which are stored elsewhere. Simply redownload and it will work again. But it may scare users. It’s the same as with other macOS applications.

In a followup we could improve this further by moving everything in the archive into a folder. That folder could contain a README, and we could even include bitcoin-cl, bitcoind and (more important perhaps) bitcoin-wallet somewhere.

Sjors commented at 12:29 pm on March 30, 2023: member

The above was done with make deploy on macOS. I’d like to test the Guix build too. @achow101 can you sign it? Or is there a way to self-sign it?

in contrib/guix/manifest.scm:8 in c5342f0877 outdated

4@@ -5,7 +5,6 @@
5              (gnu packages bash)
6              (gnu packages bison)
7              (gnu packages certs)
8-             (gnu packages cdrom)

Sjors commented at 12:38 pm on March 30, 2023:

💿

Sjors commented at 12:39 pm on March 30, 2023: member

Code review ACK c5342f0877b663e028c0acd807daf4d1e02b46e5

RandyMcMillan commented at 12:50 pm on March 30, 2023: contributor

note: a bundled README should be in README.txt format - we can’t assume the user can open .md files by default.

fanquake commented at 9:24 am on March 31, 2023: member

we can’t assume the user can open .md files by default.

I’m pretty sure we can assume that on macOS.

fanquake force-pushed on Apr 5, 2023

fanquake commented at 2:04 pm on April 5, 2023: member

Rebased, and added a number of small doc fixups.

fanquake force-pushed on Apr 14, 2023

Sjors commented at 9:39 am on May 9, 2023: member

When I do make followed by make deploy on e82e73103ce81159f6f1a51408ce5411b88a12b2 on macOS 13.3.1 I end up with three files / folders:

Bitcoin-Qt.app (which Finder displays as “Bitcoin Core”)
Bitcoin-Core.zip
dist/Bitcoin-Qt.app

It seems like only the zip file needs to be there?

fanquake force-pushed on May 29, 2023

fanquake commented at 1:34 pm on May 29, 2023: member

I end up with three files / folders:

This is the same as the current build process, where you end up with:

Bitcoin-Qt.app (which Finder displays as “Bitcoin Core”)
Bitcoin-Core.dmg
dist/Bitcoin-Qt.app

Happy to refine/rework this further in a follow up, but don’t really want to start changing this now, as it’s not new behaviour.

Sjors commented at 1:25 pm on May 30, 2023: member

Happy to leave that to later PR.

tACK e82e73103ce81159f6f1a51408ce5411b88a12b2 (will check the rebase)

utACK bec052f9ac0b8986c1c6eb9b93ca2c10e9009ac0

fanquake requested review from achow101 on May 30, 2023

fanquake requested review from hebasto on May 31, 2023

hebasto commented at 4:34 pm on May 31, 2023: member

The commits can be improved, but currently good enough for (non-guix) testing / discussion.

What are plans regarding Guix builds?

fanquake commented at 4:36 pm on May 31, 2023: member

What are plans regarding Guix builds?

What you’ve quoted was just an outdated part of the PR description, that I’ve now dropped.

hebasto commented at 4:39 pm on May 31, 2023: member

What are plans regarding Guix builds?

What you’ve quoted was just an outdated part of the PR description, that I’ve now dropped.

Well, then Guix does not produce unsigned *-apple-darwin-unsigned.zip, instead of *-apple-darwin-unsigned.dmg:

01bed850e74f985e3db277160529aff767f4d3be00822ee8e204cdff304664727  guix-build-bec052f9ac0b/output/arm64-apple-darwin/SHA256SUMS.part
16b3a93b33d163dcc6a1a8582c3db1fe2c828620757c078e0c59f3e1b1eee3990  guix-build-bec052f9ac0b/output/arm64-apple-darwin/bitcoin-bec052f9ac0b-arm64-apple-darwin-unsigned.tar.gz
26c0b10abc82fa15aa54f16bafb4d32680ac37e1f4fd8ca9a73ecd2b1c57198c9  guix-build-bec052f9ac0b/output/arm64-apple-darwin/bitcoin-bec052f9ac0b-arm64-apple-darwin.tar.gz
3a3b761f21252bdb53e397b92658f95512f8bf030a464b8ec153dd87796bcb328  guix-build-bec052f9ac0b/output/dist-archive/bitcoin-bec052f9ac0b.tar.gz

fanquake force-pushed on Jun 1, 2023

fanquake commented at 5:11 pm on June 1, 2023: member

Guix does not produce unsigned

Fixed.

DrahtBot added the label CI failed on Jun 1, 2023

fanquake force-pushed on Jun 2, 2023

hebasto commented at 10:44 am on June 4, 2023: member

Guix does not produce unsigned

Fixed.

Now, it needs to be reproducible:

build #1:

08f0fbd31364e2bc589be140372c56a71d8db0ccb06118923a8a6f461c65728ab  guix-build-414e840c297f/output/arm64-apple-darwin/SHA256SUMS.part
18aa7c8fed1f8cc7f2d4735b87c4f57c6383191d71b10553729604863beda7e01  guix-build-414e840c297f/output/arm64-apple-darwin/bitcoin-414e840c297f-arm64-apple-darwin-unsigned.tar.gz
2ea3f6623b130cf8da7d877e8828d607ca1a72654811da8fd3a840388e27cfe19  guix-build-414e840c297f/output/arm64-apple-darwin/bitcoin-414e840c297f-arm64-apple-darwin-unsigned.zip
314812ef0488cbb6e4d442f086472dcc5f2f7fac0c469d5d0c9f0e2d99b0b8c55  guix-build-414e840c297f/output/arm64-apple-darwin/bitcoin-414e840c297f-arm64-apple-darwin.tar.gz
43dca7457cb512cd812b62d21bc7849f935e8444cd8e05982d039eff174f9ef31  guix-build-414e840c297f/output/dist-archive/bitcoin-414e840c297f.tar.g

build #2:

0308e2ca63883a7c710543701ddad60b5a6640882800604a8c4fa8827a7e810d1  guix-build-414e840c297f/output/arm64-apple-darwin/SHA256SUMS.part
18aa7c8fed1f8cc7f2d4735b87c4f57c6383191d71b10553729604863beda7e01  guix-build-414e840c297f/output/arm64-apple-darwin/bitcoin-414e840c297f-arm64-apple-darwin-unsigned.tar.gz
2d4c166747d7478afc3859650eea289fa73b66a8a6f7bee28501912a628b2149e  guix-build-414e840c297f/output/arm64-apple-darwin/bitcoin-414e840c297f-arm64-apple-darwin-unsigned.zip
314812ef0488cbb6e4d442f086472dcc5f2f7fac0c469d5d0c9f0e2d99b0b8c55  guix-build-414e840c297f/output/arm64-apple-darwin/bitcoin-414e840c297f-arm64-apple-darwin.tar.gz
43dca7457cb512cd812b62d21bc7849f935e8444cd8e05982d039eff174f9ef31  guix-build-414e840c297f/output/dist-archive/bitcoin-414e840c297f.tar.gz

in Makefile.am:135 in 414e840c29 outdated

135 APP_DIST_DIR=$(top_builddir)/dist
136 
137-$(OSX_DMG): deploydir
138-	$(XORRISOFS) -D -l -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -o $@ $(APP_DIST_DIR) -- $(if $(SOURCE_DATE_EPOCH),-volume_date all_file_dates =$(SOURCE_DATE_EPOCH))
139+$(OSX_ZIP): deploydir
140+		zip -r $@ $(APP_DIST_DIR)

hebasto commented at 3:12 pm on June 24, 2023:

8d8d4325fedad5c140ea1ad4568f19609c431e2e

The following diff is intended to fix the reproducibility issue:

0	if [ -n "$(SOURCE_DATE_EPOCH)" ]; then find $(APP_DIST_DIR) -exec touch -d @$(SOURCE_DATE_EPOCH) {} +; fi
1	zip -X -r $@ $(APP_DIST_DIR)

fanquake force-pushed on Jun 26, 2023

hebasto commented at 11:10 am on June 26, 2023: member

Guix build on arm64:

03bdff2fec75d06d588b91ae89c94cbeea474d11e4c03d0b2bbf89de8565b8f92  guix-build-18df951ef677/output/arm64-apple-darwin/SHA256SUMS.part
1c0c0e06b70e703eb47f2e9b6ae90b036af8585acba665a2ebd3aa9bbeb0159f0  guix-build-18df951ef677/output/arm64-apple-darwin/bitcoin-18df951ef677-arm64-apple-darwin-unsigned.tar.gz
23f0772f177a655e5d8b41bdd9355dec47100de9490d12335d13661197d571b7d  guix-build-18df951ef677/output/arm64-apple-darwin/bitcoin-18df951ef677-arm64-apple-darwin-unsigned.zip
3d775d4564758b92f7517c240b3bb65d228ab9f19f8d848d8396f6624ecd41fed  guix-build-18df951ef677/output/arm64-apple-darwin/bitcoin-18df951ef677-arm64-apple-darwin.tar.gz
493c6d27d0a4264c5f66ceeafdd49967dbfab28561db9df5f3e9b8e7de912e970  guix-build-18df951ef677/output/dist-archive/bitcoin-18df951ef677.tar.gz
5ba3c3aa83ffb72adb20e38191bd2aa5e9f0ec4f378f6adbabf08bcc601b6c2f7  guix-build-18df951ef677/output/x86_64-apple-darwin/SHA256SUMS.part
6cde75ea3fd7c8d5227d41723909e2078cfe747ee829269755863ef629a819b95  guix-build-18df951ef677/output/x86_64-apple-darwin/bitcoin-18df951ef677-x86_64-apple-darwin-unsigned.tar.gz
7caa6d10eada1f282447a7e885cda3132b4e73fc9cf37ba01eb6efd0d7060cf45  guix-build-18df951ef677/output/x86_64-apple-darwin/bitcoin-18df951ef677-x86_64-apple-darwin-unsigned.zip
8b21585791849cc6ef741f318fe041c1c4bd1eaa84e3e255f75989be66f05876a  guix-build-18df951ef677/output/x86_64-apple-darwin/bitcoin-18df951ef677-x86_64-apple-darwin.tar.gz

hebasto commented at 12:02 pm on June 26, 2023: member

Guix build on x86_64:

0a375630be0529b0316ddf8378ea890693e2c2968935cdc857f07331ce9ae6ee4  guix-build-18df951ef677/output/arm64-apple-darwin/SHA256SUMS.part
1c0c0e06b70e703eb47f2e9b6ae90b036af8585acba665a2ebd3aa9bbeb0159f0  guix-build-18df951ef677/output/arm64-apple-darwin/bitcoin-18df951ef677-arm64-apple-darwin-unsigned.tar.gz
2532e0c561f0ada4298c753128d09fb5d72ceee241260e1aca82541a2ad1fbeb5  guix-build-18df951ef677/output/arm64-apple-darwin/bitcoin-18df951ef677-arm64-apple-darwin-unsigned.zip
3d775d4564758b92f7517c240b3bb65d228ab9f19f8d848d8396f6624ecd41fed  guix-build-18df951ef677/output/arm64-apple-darwin/bitcoin-18df951ef677-arm64-apple-darwin.tar.gz
493c6d27d0a4264c5f66ceeafdd49967dbfab28561db9df5f3e9b8e7de912e970  guix-build-18df951ef677/output/dist-archive/bitcoin-18df951ef677.tar.gz
52cc29ebe9d157e212506d747d228c9cd2d2bacf25a46683539233af78db39974  guix-build-18df951ef677/output/x86_64-apple-darwin/SHA256SUMS.part
6cde75ea3fd7c8d5227d41723909e2078cfe747ee829269755863ef629a819b95  guix-build-18df951ef677/output/x86_64-apple-darwin/bitcoin-18df951ef677-x86_64-apple-darwin-unsigned.tar.gz
7130b75c6d7590894abbaea4a7ae34f1ad3648712f677994531e2e909db35d6ee  guix-build-18df951ef677/output/x86_64-apple-darwin/bitcoin-18df951ef677-x86_64-apple-darwin-unsigned.zip
8b21585791849cc6ef741f318fe041c1c4bd1eaa84e3e255f75989be66f05876a  guix-build-18df951ef677/output/x86_64-apple-darwin/bitcoin-18df951ef677-x86_64-apple-darwin.tar.gz

in Makefile.am:136 in 18df951ef6 outdated

136 
137-$(OSX_DMG): deploydir
138-	$(XORRISOFS) -D -l -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -o $@ $(APP_DIST_DIR) -- $(if $(SOURCE_DATE_EPOCH),-volume_date all_file_dates =$(SOURCE_DATE_EPOCH))
139+$(OSX_ZIP): deploydir
140+	if [ -n "$(SOURCE_DATE_EPOCH)" ]; then find $(APP_DIST_DIR) -exec touch -d @$(SOURCE_DATE_EPOCH) {} +; fi
141+	zip -r $@ $(APP_DIST_DIR)

hebasto commented at 12:47 pm on June 26, 2023:

The -X option is still needed as it was suggested earlier:

0	zip -X -r $@ $(APP_DIST_DIR)

DrahtBot removed the label CI failed on Jun 26, 2023

fanquake force-pushed on Jun 27, 2023

maflcko added the label DrahtBot Guix build requested on Jun 27, 2023

fanquake commented at 10:55 am on June 27, 2023: member

0cbe2109a1e88b431f462f6b8a62e785fe1f5f6249da55f984129c2a2ef454503  guix-build-23d89518e907/output/arm64-apple-darwin/SHA256SUMS.part
147c72d2c1c4ec35cd72db66cd602a213b18d43274dc3ab3fa8065f05e8844f83  guix-build-23d89518e907/output/arm64-apple-darwin/bitcoin-23d89518e907-arm64-apple-darwin-unsigned.tar.gz
2eeeccfef61a67f39741e153b392cadc3e44ac317fd0608b30fcd8aab206cd2d2  guix-build-23d89518e907/output/arm64-apple-darwin/bitcoin-23d89518e907-arm64-apple-darwin-unsigned.zip
3a662ab05fd44ef5c08a89d8d140d0bb66c8e53642c11222aef49cdd5e3a86321  guix-build-23d89518e907/output/arm64-apple-darwin/bitcoin-23d89518e907-arm64-apple-darwin.tar.gz
4bc4b3bfdd24b64fb3decb582ee4b32bfa4b15ffdd23753a73135f7a5977cbf4a  guix-build-23d89518e907/output/dist-archive/bitcoin-23d89518e907.tar.gz
52338ff8dc38286b169b8efc213eae7e62481d756e01056245f55126dc97dbc8e  guix-build-23d89518e907/output/x86_64-apple-darwin/SHA256SUMS.part
6c6cd0dbcb3eb8dc79c2e78b0e954271dfa724d9523c3338c8475a46bc1d2efd4  guix-build-23d89518e907/output/x86_64-apple-darwin/bitcoin-23d89518e907-x86_64-apple-darwin-unsigned.tar.gz
75a31c1b115c5e2d384d330e25633ea661d5c2a20acafe0cad95e89faafad84e4  guix-build-23d89518e907/output/x86_64-apple-darwin/bitcoin-23d89518e907-x86_64-apple-darwin-unsigned.zip
8fa7954064abdedb2ee0e6c83cad3f8a86a1a87c447f7a3515ccd8da2ec244334  guix-build-23d89518e907/output/x86_64-apple-darwin/bitcoin-23d89518e907-x86_64-apple-darwin.tar.gz

hebasto commented at 11:42 am on June 27, 2023: member

Guix build on arm64:

0a9eb04f494db558318b52ec609d67478c761b281902204cc1ebfb49450216ac9  guix-build-23d89518e907/output/arm64-apple-darwin/SHA256SUMS.part
147c72d2c1c4ec35cd72db66cd602a213b18d43274dc3ab3fa8065f05e8844f83  guix-build-23d89518e907/output/arm64-apple-darwin/bitcoin-23d89518e907-arm64-apple-darwin-unsigned.tar.gz
204651cc05a9ae9786ecdba7c44f6823559e70aeb75d84875907c61e0ad137cdc  guix-build-23d89518e907/output/arm64-apple-darwin/bitcoin-23d89518e907-arm64-apple-darwin-unsigned.zip
3a662ab05fd44ef5c08a89d8d140d0bb66c8e53642c11222aef49cdd5e3a86321  guix-build-23d89518e907/output/arm64-apple-darwin/bitcoin-23d89518e907-arm64-apple-darwin.tar.gz
4bc4b3bfdd24b64fb3decb582ee4b32bfa4b15ffdd23753a73135f7a5977cbf4a  guix-build-23d89518e907/output/dist-archive/bitcoin-23d89518e907.tar.gz
51f91c2686d2973013cba97e67b4b9f68430b5db05d21869fee19447d21cfc85d  guix-build-23d89518e907/output/x86_64-apple-darwin/SHA256SUMS.part
6c6cd0dbcb3eb8dc79c2e78b0e954271dfa724d9523c3338c8475a46bc1d2efd4  guix-build-23d89518e907/output/x86_64-apple-darwin/bitcoin-23d89518e907-x86_64-apple-darwin-unsigned.tar.gz
7807cd39d020c344618bd0e7567c9de55a44a8280ddde78a7879c7fa1cc2253a2  guix-build-23d89518e907/output/x86_64-apple-darwin/bitcoin-23d89518e907-x86_64-apple-darwin-unsigned.zip
8fa7954064abdedb2ee0e6c83cad3f8a86a1a87c447f7a3515ccd8da2ec244334  guix-build-23d89518e907/output/x86_64-apple-darwin/bitcoin-23d89518e907-x86_64-apple-darwin.tar.gz

in Makefile.am:136 in 23d89518e9 outdated

136 
137-$(OSX_DMG): deploydir
138-	$(XORRISOFS) -D -l -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -o $@ $(APP_DIST_DIR) -- $(if $(SOURCE_DATE_EPOCH),-volume_date all_file_dates =$(SOURCE_DATE_EPOCH))
139+$(OSX_ZIP): deploydir
140+	if [ -n "$(SOURCE_DATE_EPOCH)" ]; then find $(APP_DIST_DIR) -exec touch -d @$(SOURCE_DATE_EPOCH) {} +; fi
141+	zip -X -r $@ $(APP_DIST_DIR)

hebasto commented at 6:41 pm on June 27, 2023:

Unfortunately, using the -r option still introduces non-reproducibilty. Diffoscope points at some metadata related to directories. Not sure, but it looks like they are about creation timestamps.

Suggesting to use the same approach as we are using for Windows builds:

0	find $(APP_DIST_DIR) | sort | zip -X@ $@

With this diff, two subsequent runs on my Ubuntu 22.04 returned the same hashes.

fanquake commented at 10:58 am on June 28, 2023:

Applied.

hebasto commented at 6:58 pm on June 27, 2023: member

As evidence, Visual Studio Code has recently started distributing their macOS builds as ZIP files instead of DMGs, as you can see on their download page: code.visualstudio.com/Download.

In comparison to UX of downloading VSCode-darwin.zip, in the current PR branch in Guix archive, there is a top directory named dist, which seems redundant:

hebasto commented at 6:03 am on June 28, 2023: member

Someone on Twitter drew attention to potential security implications, for instance:

DrahtBot removed the label DrahtBot Guix build requested on Jun 28, 2023

fanquake force-pushed on Jun 28, 2023

fanquake commented at 11:30 am on June 28, 2023: member

07851f08737a0133002c0224d4bd5e52aed7eaee91adac46f1247ef164775d037  guix-build-23d39c5079cf/output/arm64-apple-darwin/SHA256SUMS.part
1172e378d18cd9c624e4cdce51228bfbb43d25098871c18911c70eeb1c2390f34  guix-build-23d39c5079cf/output/arm64-apple-darwin/bitcoin-23d39c5079cf-arm64-apple-darwin-unsigned.tar.gz
23de4d2cec142a8464788da7571b2f09a47893c7f8d75fe52912ecfcefac72242  guix-build-23d39c5079cf/output/arm64-apple-darwin/bitcoin-23d39c5079cf-arm64-apple-darwin-unsigned.zip
333da433dbd3c3d642756a62d19da37270a18a13dd2dfe9cb40327a510f722b7f  guix-build-23d39c5079cf/output/arm64-apple-darwin/bitcoin-23d39c5079cf-arm64-apple-darwin.tar.gz
41f30f314a56781944dd3fd05eef8604afe9cf300361381f157b197e349501da8  guix-build-23d39c5079cf/output/dist-archive/bitcoin-23d39c5079cf.tar.gz
5f14dae2b0fb901a2fc4d70d8af58bc83832a3f2d7dd238db6e0e4a7e77888c09  guix-build-23d39c5079cf/output/x86_64-apple-darwin/SHA256SUMS.part
6085b59e69556d2f89cc6f662fc4d8da94b01d3c7d47b414128c0f5f6ee38b8fc  guix-build-23d39c5079cf/output/x86_64-apple-darwin/bitcoin-23d39c5079cf-x86_64-apple-darwin-unsigned.tar.gz
7f7f1161609ca379ec60002d684127e831ed9e72404ce4202262f2bb01bc77d96  guix-build-23d39c5079cf/output/x86_64-apple-darwin/bitcoin-23d39c5079cf-x86_64-apple-darwin-unsigned.zip
8fb19c22a2e31de8189b2696a8d457902423c40878dc4c031e75e9a9797d04c9a  guix-build-23d39c5079cf/output/x86_64-apple-darwin/bitcoin-23d39c5079cf-x86_64-apple-darwin.tar.gz

hebasto commented at 11:58 am on June 28, 2023: member

Guix build on x86_64:

07851f08737a0133002c0224d4bd5e52aed7eaee91adac46f1247ef164775d037  guix-build-23d39c5079cf/output/arm64-apple-darwin/SHA256SUMS.part
1172e378d18cd9c624e4cdce51228bfbb43d25098871c18911c70eeb1c2390f34  guix-build-23d39c5079cf/output/arm64-apple-darwin/bitcoin-23d39c5079cf-arm64-apple-darwin-unsigned.tar.gz
23de4d2cec142a8464788da7571b2f09a47893c7f8d75fe52912ecfcefac72242  guix-build-23d39c5079cf/output/arm64-apple-darwin/bitcoin-23d39c5079cf-arm64-apple-darwin-unsigned.zip
333da433dbd3c3d642756a62d19da37270a18a13dd2dfe9cb40327a510f722b7f  guix-build-23d39c5079cf/output/arm64-apple-darwin/bitcoin-23d39c5079cf-arm64-apple-darwin.tar.gz
41f30f314a56781944dd3fd05eef8604afe9cf300361381f157b197e349501da8  guix-build-23d39c5079cf/output/dist-archive/bitcoin-23d39c5079cf.tar.gz
5f14dae2b0fb901a2fc4d70d8af58bc83832a3f2d7dd238db6e0e4a7e77888c09  guix-build-23d39c5079cf/output/x86_64-apple-darwin/SHA256SUMS.part
6085b59e69556d2f89cc6f662fc4d8da94b01d3c7d47b414128c0f5f6ee38b8fc  guix-build-23d39c5079cf/output/x86_64-apple-darwin/bitcoin-23d39c5079cf-x86_64-apple-darwin-unsigned.tar.gz
7f7f1161609ca379ec60002d684127e831ed9e72404ce4202262f2bb01bc77d96  guix-build-23d39c5079cf/output/x86_64-apple-darwin/bitcoin-23d39c5079cf-x86_64-apple-darwin-unsigned.zip
8fb19c22a2e31de8189b2696a8d457902423c40878dc4c031e75e9a9797d04c9a  guix-build-23d39c5079cf/output/x86_64-apple-darwin/bitcoin-23d39c5079cf-x86_64-apple-darwin.tar.gz

Matched to @fanquake’s one.

UPD. Got the same hashes on arm64.

fanquake force-pushed on Jun 29, 2023

maflcko added the label DrahtBot Guix build requested on Jun 29, 2023

prusnak commented at 10:46 am on June 29, 2023: contributor

zip foo.zip dist should read zip foo.zip dist/* to drop the top-level dist folder

DrahtBot removed the label DrahtBot Guix build requested on Jun 29, 2023

DrahtBot added the label Needs rebase on Aug 27, 2023

fanquake force-pushed on Sep 5, 2023

DrahtBot removed the label Needs rebase on Sep 5, 2023

maflcko added the label DrahtBot Guix build requested on Sep 5, 2023

DrahtBot commented at 6:32 am on September 6, 2023: contributor

Guix builds (on x86_64)

File	commit 9d3b216e009a53ffcecd57e7f10df15cccd5fd6d(master)	commit 9867382b06d5533d4f25abf4b86b6c79975e36df(master and this pull)
SHA256SUMS.part	`3c57cd8199c723d6...`	`2eba93b4fbc91ca8...`
*-aarch64-linux-gnu-debug.tar.gz	`b3be5bf8b13acd79...`	`f4d78093d8637e39...`
*-aarch64-linux-gnu.tar.gz	`9e53fc8bdaae2991...`	`b5b09446e21c2d72...`
*-arm-linux-gnueabihf-debug.tar.gz	`2da52974294d7aa7...`	`7a7c0950d04b7acd...`
*-arm-linux-gnueabihf.tar.gz	`849397fb888189c0...`	`692e3a011e7c2b11...`
*-arm64-apple-darwin-unsigned.dmg	`83850133c42db63f...`
*-arm64-apple-darwin-unsigned.tar.gz	`198c1392640d6281...`	`53c6d09d1d68cd77...`
*-arm64-apple-darwin.tar.gz	`577cff9bca290b78...`	`eed69b61e2405f9a...`
*-powerpc64-linux-gnu-debug.tar.gz	`df855e3842293446...`	`772ca96e576228d5...`
*-powerpc64-linux-gnu.tar.gz	`6dbc4447804f6cfe...`	`ef8bba9df629e9e1...`
*-powerpc64le-linux-gnu-debug.tar.gz	`394cf58d49da4576...`	`0f7b6a6a968878cb...`
*-powerpc64le-linux-gnu.tar.gz	`d4bc7a07b39cffe9...`	`00a7ac08432057a0...`
*-riscv64-linux-gnu-debug.tar.gz	`53fe0d40b995b2f3...`	`3c6aa74c60ab6d6e...`
*-riscv64-linux-gnu.tar.gz	`6fe76c88c2922c51...`	`ba6077364db593e2...`
*-x86_64-apple-darwin-unsigned.dmg	`5808e1822110dd7f...`
*-x86_64-apple-darwin-unsigned.tar.gz	`520cbaa034c71b5b...`	`a4e1ae5c6638fd28...`
*-x86_64-apple-darwin.tar.gz	`9cf60f219aa2bfba...`	`4017d074beeb2418...`
*-x86_64-linux-gnu-debug.tar.gz	`ffd9cc7139745a85...`	`1f70316bf34b83aa...`
*-x86_64-linux-gnu.tar.gz	`61204c2275003f89...`	`f6d0c0fec9e0284b...`
*.tar.gz	`99ad0782b2c9f90d...`	`47b88d1c9d319e5b...`
guix_build.log	`e857c1500e6e0d32...`	`a23762b15136650f...`
*-arm64-apple-darwin-unsigned.zip		`04ca1745805fd6a1...`
*-x86_64-apple-darwin-unsigned.zip		`d74a427298d13114...`
guix_build.log.diff		`6d05b983d5624a71...`

DrahtBot removed the label DrahtBot Guix build requested on Sep 6, 2023

maflcko requested review from Sjors on Sep 6, 2023

maflcko requested review from hebasto on Sep 6, 2023

hebasto commented at 4:22 pm on September 6, 2023: member

Tested bitcoin-8a6275ba6ea6-x86_64-apple-darwin-unsigned.zip.

I think a couple of comments still need to be addressed:

Sjors commented at 5:40 pm on September 6, 2023: member

tACK 8a6275ba6ea6e8eb5342442221d27d71670e0be8

Tested that it produces a working zip / binary for me on Intel macOS 13.5.1, both when using make deploy on the machine itself, and when using Guix on Ubuntu (AMD).

0fec40bc404855508466d4fdce4f729770b73bf882d9622dbd3505ae2673bb8f1  guix-build-8a6275ba6ea6/output/arm64-apple-darwin/SHA256SUMS.part
12edaca85d4a5f45f0c6b3c461dc90a878a5c672025a965c2f0452dedd722e1ed  guix-build-8a6275ba6ea6/output/arm64-apple-darwin/bitcoin-8a6275ba6ea6-arm64-apple-darwin-unsigned.tar.gz
2d603238e2d5410125058a3810af296fc3d575bf86011feddc2c7ff41336098a7  guix-build-8a6275ba6ea6/output/arm64-apple-darwin/bitcoin-8a6275ba6ea6-arm64-apple-darwin-unsigned.zip
3e882484df88c76dec6a0eb000735c7941831a4df98f86a4309839221618f6650  guix-build-8a6275ba6ea6/output/arm64-apple-darwin/bitcoin-8a6275ba6ea6-arm64-apple-darwin.tar.gz
4367a361ccd3fa9bc6b8ac99eb23b42a6d4baed6746067f94f6fbb41b1cb5351d  guix-build-8a6275ba6ea6/output/dist-archive/bitcoin-8a6275ba6ea6.tar.gz
525353a797dd0e37d229414ff814692c7a2b6930b16e33d41b8e999f1777c92ab  guix-build-8a6275ba6ea6/output/x86_64-apple-darwin/SHA256SUMS.part
68cf69e85249762e04e9fdb707d9e50d37f9d9f6c7aa239477f5a5c913063201e  guix-build-8a6275ba6ea6/output/x86_64-apple-darwin/bitcoin-8a6275ba6ea6-x86_64-apple-darwin-unsigned.tar.gz
756c042d999726e8179f69b5d354bfcb82fcc69b1926f312e30c396d6752cffa1  guix-build-8a6275ba6ea6/output/x86_64-apple-darwin/bitcoin-8a6275ba6ea6-x86_64-apple-darwin-unsigned.zip
8c99a9e1e01db20140855fb2dfe662d750e773bcd3aee2ee94f27905f4bd31b9d  guix-build-8a6275ba6ea6/output/x86_64-apple-darwin/bitcoin-8a6275ba6ea6-x86_64-apple-darwin.tar.gz

DrahtBot removed review request from Sjors on Sep 6, 2023

build: add -zip option to macdeployqtplus

This zips the app bundle in /dist.

bc95abd588

build: produce a .zip for macOS distribution

Instead of a .dmg.

b7e409b7bf

macdeploy: remove DMG generation from deploy script e78916bf9d

build: remove dmg dependencies 11f8b6b2b5

fanquake force-pushed on Sep 7, 2023

hebasto commented at 10:58 am on September 7, 2023: member

Having an error when building Guix:

0cd ./dist && find . | sort | zip -X@ ..//distsrc-base/distsrc-11f8b6b2b58e-x86_64-apple-darwin/output/bitcoin-11f8b6b2b58e-x86_64-apple-darwin-unsigned.zip
1zip I/O error: No such file or directory
2zip error: Could not create output file (..//distsrc-base/distsrc-11f8b6b2b58e-x86_64-apple-darwin/output/bitcoin-11f8b6b2b58e-x86_64-apple-darwin-unsigned.zip)

fanquake commented at 10:59 am on September 7, 2023: member

Someone else can take this over if interested.

fanquake closed this on Sep 7, 2023

fanquake added the label Up for grabs on Sep 7, 2023

Sjors commented at 1:41 pm on September 7, 2023: member

Difference between my ACK and the last push:

 0$ git range-diff master 8a6275ba6ea6e8eb5342442221d27d71670e0be8 HEAD
 11:  667d5735ce = 1:  bc95abd588 build: add -zip option to macdeployqtplus
 22:  85f8152b47 ! 2:  b7e409b7bf build: produce a .zip for macOS distribution
 3    @@ Makefile.am: osx_volname:
 4     -  $(XORRISOFS) -D -l -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -o $@ $(APP_DIST_DIR) -- $(if $(SOURCE_DATE_EPOCH),-volume_date all_file_dates =$(SOURCE_DATE_EPOCH))
 5     +$(OSX_ZIP): deploydir
 6     +  if [ -n "$(SOURCE_DATE_EPOCH)" ]; then find $(APP_DIST_DIR) -exec touch -d @$(SOURCE_DATE_EPOCH) {} +; fi
 7    -+  find $(APP_DIST_DIR) | sort | zip -X@ $@
 8    ++  cd $(APP_DIST_DIR) && find . | sort | zip -X@ ../$@
 9
10      $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
11        INSTALL_NAME_TOOL=$(INSTALL_NAME_TOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR)
123:  117d01be1d = 3:  e78916bf9d macdeploy: remove DMG generation from deploy script
134:  8a6275ba6e = 4:  11f8b6b2b5 build: remove dmg dependencies

Getting the same (?) error as @hebasto now :-(

0if [ -n "1668774980" ]; then find ./dist -exec touch -d [@1668774980](/bitcoin-bitcoin/contributor/1668774980/) {} +; fi
1cd ./dist && find . | sort | zip -X@ ..//distsrc-base/distsrc-11f8b6b2b58e-x86_64-apple-darwin/output/bitcoin-11f8b6b2b58e-x86_64-apple-darwin-unsigned.zip
2zip I/O error: No such file or directory
3zip error: Could not create output file (..//distsrc-base/distsrc-11f8b6b2b58e-x86_64-apple-darwin/output/bitcoin-11f8b6b2b58e-x86_64-apple-darwin-unsigned.zip)
4make: *** [Makefile:1304: /distsrc-base/distsrc-11f8b6b2b58e-x86_64-apple-darwin/output/bitcoin-11f8b6b2b58e-x86_64-apple-darwin-unsigned.zip] Error 15

If anyone takes this over, please ping me.

hebasto commented at 9:55 am on September 8, 2023: member

Picked in #28432.

hebasto removed the label Up for grabs on Sep 8, 2023

fanquake referenced this in commit e9a4793b82 on Sep 20, 2023

fanquake deleted the branch on Mar 18, 2024

build: produce a .zip for macOS distribution #27099

Reviews

Conflicts

Guix builds (on x86_64)