build: Produce a .zip for macOS distribution
#28432
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. ConflictsReviewers, this pull request conflicts with the following ones:
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. |
This was referenced Sep 8, 2023
|
ACK b334ef8 Tested again on Intel macOS by building on the same machine and using the (unsigned) guix build. Guix hashes match @hebasto's: |
|
Assigned milestone, because the issue has a milestone. |
stickies-v
reviewed
Sep 15, 2023
There was a problem hiding this comment.
Approach ACK. Skipping the dmg for a simplified build process makes sense to me, it's an easy enough setup process with the zip too. An additional installation hint on https://bitcoincore.org/en/download/ would probably be helpful.
Tested on M1 Pro with make deploy, as well as guix build (done on amd64 bookworm). Both binaries work well, and my shasums match too:
% find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | sort -z | xargs -0 sha256sum
7d771d7279c1c5480315e0570914724738ef684ae599943f21421fd90bb2db52 guix-build-b334ef8dbccc/output/arm64-apple-darwin/bitcoin-b334ef8dbccc-arm64-apple-darwin.tar.gz
51f6de1530136253f7a6616fadea55e9e5ee3ec6f8d350e9069e5953d2487f20 guix-build-b334ef8dbccc/output/arm64-apple-darwin/bitcoin-b334ef8dbccc-arm64-apple-darwin-unsigned.tar.gz
a20203dfd9624bb445a5c7d1d3e7746feb3910df033c413df8354b2606d2293a guix-build-b334ef8dbccc/output/arm64-apple-darwin/bitcoin-b334ef8dbccc-arm64-apple-darwin-unsigned.zip
d0294bf567dd0403070ad599c93900fccd54d352396d0cec6778e6c04a7bfe8f guix-build-b334ef8dbccc/output/arm64-apple-darwin/SHA256SUMS.part
59f6e88ba0f28010feecfdc1fd67dd32de35c8eecc7ea4a73164d550f83eba57 guix-build-b334ef8dbccc/output/dist-archive/bitcoin-b334ef8dbccc.tar.gz
36ca3883439d36de7e27ba8edaa3dbead910a28396c1229ff3ce427eeba237f5 guix-build-b334ef8dbccc/output/x86_64-apple-darwin/bitcoin-b334ef8dbccc-x86_64-apple-darwin.tar.gz
c315865d94d98ae5830d80bfa5adb14b3eec111762fbd2ae234da9a20fedc999 guix-build-b334ef8dbccc/output/x86_64-apple-darwin/bitcoin-b334ef8dbccc-x86_64-apple-darwin-unsigned.tar.gz
e857d41029a8d20bce3db5bc1e4636dd863cc19b6e454a19b3f97764408539e7 guix-build-b334ef8dbccc/output/x86_64-apple-darwin/bitcoin-b334ef8dbccc-x86_64-apple-darwin-unsigned.zip
c23611d70355b31f70094b26555bce361cfa81f5044a2ab4f14ac1a95aae2cc7 guix-build-b334ef8dbccc/output/x86_64-apple-darwin/SHA256SUMS.part
We still have references to xorriso and xorrisofs, are those still necessary?
I'm a bit out of my depth with this build stuff so this is probably as far as my review will go.
This zips the app bundle in /dist.
Instead of a .dmg. Co-authored-by: fanquake <fanquake@gmail.com>
|
Updated b334ef8 -> f52a72a (pr28432.01 -> pr28432.02):
|
|
My updated Guix builds: |
jarolrod
approved these changes
Sep 19, 2023
There was a problem hiding this comment.
ACK b5790c3
Tested working, tested through make deploy. One slight behavior change to note, consecutive expansion of the zip and its binary in the same directory will result in a naming convention for the binary of Bitcoin Qt [n], whereas with the current DMG approach it would be Bitcoin Core [n].
Of course, that's not something we need to optimize for :D
Frank-GER
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Sep 25, 2023
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Sep 26, 2023
fanquake
added a commit
that referenced
this pull request
Nov 24, 2023
0ffcc5b ci: remove python3-setuptools from mac build deps (fanquake) Pull request description: Remove no-longer used python-setuptools. Followup to #28432. Related to #28845. ACKs for top commit: hebasto: ACK 0ffcc5b, I have reviewed the code and it looks OK. TheCharlatan: ACK 0ffcc5b Tree-SHA512: c3ac441c85f6f203414e5e2ad0c453ee35fa4765c72c5ff79699aa622c0db767651890ac0c8507f5ed18e18e3b0e23f2952f677476424cfda4df93647a367c26
fanquake
added a commit
to fanquake/bitcoin
that referenced
this pull request
Nov 30, 2023
Remove no-longer used libz-dev (from DMG compression). Followup to bitcoin#28432. Missed this in bitcoin#28932.
fanquake
added a commit
that referenced
this pull request
Dec 1, 2023
97d53e9 ci: remove libz-dev from macOS build deps (fanquake) Pull request description: Remove no-longer used libz-dev (from DMG compression). Followup to #28432. Missed this in #28932. ACKs for top commit: TheCharlatan: ACK 97d53e9 Tree-SHA512: ea4e46d83a11cfb0d77e7c5b370359864a026ca58e02de1a3d30458e4463dabd338db9546da63b782a7fa0ce199446c418fbfdfc400f3803b0ea9dd626aed42f
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It is #27099 revived with addressed comments.
From #27099 (comment):
That's how it looks on macOS: