Skip to content

Conversation

achow101
Copy link
Member

@achow101 achow101 commented Oct 30, 2023

The zip for codesigned MacOS distribution needs to have all files included and have their timestamps set to the same value (SOURCE_DATE_EPOCH).

This uses the same pattern for zip as is done for the other zip files produced by guix.

@achow101 achow101 added this to the 26.0 milestone Oct 30, 2023
@DrahtBot
Copy link
Contributor

DrahtBot commented Oct 30, 2023

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

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK hebasto, TheCharlatan

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

@hebasto
Copy link
Member

hebasto commented Oct 30, 2023

Did you test reproducibility?

@achow101
Copy link
Member Author

Did you test reproducibility?

Not yet

@achow101 achow101 force-pushed the macos-zip-recursive branch from a8690ff to 83dd3d0 Compare October 30, 2023 19:37
@achow101 achow101 changed the title guix: Zip needs the recursive flag guix: Zip needs to include all files and set time to SOURCE_DATE_EPOCH Oct 30, 2023
@achow101
Copy link
Member Author

Updated to be reproducible and follow the same pattern done for all of the other zip files guix produces.

@achow101
Copy link
Member Author

Results for 26.0rc1:

cf4f700114c93f2175f52c9e0edbdb5702a7b5881b2a89d92d3f58029e409e6c  guix-build-26.0rc1/output/arm64-apple-darwin-codesigned/bitcoin-26.0rc1-arm64-apple-darwin.zip
3bb35035416a7359d9402e9d3061b88a337a7f95cadff063361cbd4b93ec3d05  guix-build-26.0rc1/output/x86_64-apple-darwin-codesigned/bitcoin-26.0rc1-x86_64-apple-darwin.zip

@laanwj
Copy link
Member

laanwj commented Oct 30, 2023

I replaced the two files from the commit, on top of v26.0rc1, and ran codesign. This gave the same output:

cf4f700114c93f2175f52c9e0edbdb5702a7b5881b2a89d92d3f58029e409e6c  bitcoin-26.0rc1-arm64-apple-darwin.zip
3bb35035416a7359d9402e9d3061b88a337a7f95cadff063361cbd4b93ec3d05  bitcoin-26.0rc1-x86_64-apple-darwin.zip

Have also verified that all the files are in there. I have however not tested on MacOS.

Copy link
Contributor

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 83dd3d0

Tested on a macbook and I get the same checksums as posted above.

@hebasto
Copy link
Member

hebasto commented Oct 31, 2023

Concept ACK. Still testing.

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've got the same hashes as in #28757 (comment) and #28757 (comment).

The dist top directory is redundant and should be avoided:
image

Also see: #27099 (comment)

@fanquake
Copy link
Member

Yea, we should nuke the dist/ here, otherwise, this looks good to me.

The zip for codesigned MacOS distribution needs to have all files have
the same timestamp. These files also need to be included in the zip as
zip is not automatically recursive. We use the same pattern for zip as
is done for the other zip files produced by guix.
@achow101 achow101 force-pushed the macos-zip-recursive branch from 83dd3d0 to f6f18ee Compare October 31, 2023 15:36
@achow101
Copy link
Member Author

achow101 commented Oct 31, 2023

Yea, we should nuke the dist/ here, otherwise, this looks good to me.

Should be done, testing now (need to rebuild, so could be a little bit).

Hashes for 26.0rc1:

adc40abe61a6731b4d481d27b883731d282b61995b3ca401dea49385c89ff8ef  guix-build-26.0rc1/output/arm64-apple-darwin-codesigned/bitcoin-26.0rc1-arm64-apple-darwin.zip
11ee5b21d4d0d411117a7e237d73d698170f0b18dd78ab1299499ae65abc3a1b  guix-build-26.0rc1/output/x86_64-apple-darwin-codesigned/bitcoin-26.0rc1-x86_64-apple-darwin.zip

@hebasto
Copy link
Member

hebasto commented Oct 31, 2023

My hashes for f6f18ee:

adc40abe61a6731b4d481d27b883731d282b61995b3ca401dea49385c89ff8ef  guix-build-26.0rc1/output/arm64-apple-darwin-codesigned/bitcoin-26.0rc1-arm64-apple-darwin.zip
11ee5b21d4d0d411117a7e237d73d698170f0b18dd78ab1299499ae65abc3a1b  guix-build-26.0rc1/output/x86_64-apple-darwin-codesigned/bitcoin-26.0rc1-x86_64-apple-darwin.zip

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK f6f18ee.

@DrahtBot DrahtBot requested a review from TheCharlatan October 31, 2023 15:52
Copy link
Contributor

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK f6f18ee

I get the same hashes as @hebasto and have checked that it still installs fine.

@fanquake fanquake merged commit 697ded9 into bitcoin:master Oct 31, 2023
fanquake pushed a commit to fanquake/bitcoin that referenced this pull request Oct 31, 2023
The zip for codesigned MacOS distribution needs to have all files have
the same timestamp. These files also need to be included in the zip as
zip is not automatically recursive. We use the same pattern for zip as
is done for the other zip files produced by guix.

Github-Pull: bitcoin#28757
Rebased-From: f6f18ee
@fanquake
Copy link
Member

Added to #28754.

fanquake pushed a commit to fanquake/bitcoin that referenced this pull request Oct 31, 2023
The zip for codesigned MacOS distribution needs to have all files have
the same timestamp. These files also need to be included in the zip as
zip is not automatically recursive. We use the same pattern for zip as
is done for the other zip files produced by guix.

Github-Pull: bitcoin#28757
Rebased-From: f6f18ee
fanquake added a commit that referenced this pull request Nov 1, 2023
e4e8479 doc: update manual pages for v26.0rc2 (fanquake)
0b189a9 build: bump version to v26.0rc2 (fanquake)
e097d4c gui: fix crash on selecting "Mask values" in transaction view (Sebastian Falbesoner)
05e8874 guix: update signapple (fanquake)
deccc50 guix: Zip needs to include all files with time as SOURCE_DATE_EPOCH (Andrew Chow)
fe57abd test: add coverage for snapshot chainstate not matching AssumeUTXO parameters (pablomartin4btc)
b761a58 assumeutxo, blockstorage: prevent core dump on invalid hash (pablomartin4btc)
d3ebf6e [test] Test i2p private key constraints (Vasil Dimov)
1f11784 [net] Check i2p private key constraints (dergoegge)
6544ffa bugfix: Mark CNoDestination and PubKeyDestination constructor explicit (MarcoFalke)

Pull request description:

  Backports for v26.0rc2:
  * #28695
  * #28698
  * #28728
  * #28757
  * #28759
  * bitcoin-core/gui#774

ACKs for top commit:
  josibake:
    ACK e4e8479
  hebasto:
    re-ACK e4e8479, only a backport of bitcoin-core/gui#774 added since my [recent](#28754 (review)) review.
  TheCharlatan:
    Re-ACK e4e8479

Tree-SHA512: 4b95afd26b8bf91250cb883423de8b274cefa48dc474734f5900aeb756eee3a6c656116efcfa2caff3c250678c16b70cc6b7a5d840018dc7e2c1e8161622cd61
@bitcoin bitcoin locked and limited conversation to collaborators Oct 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants