guix: Zip needs to include all files and set time to SOURCE_DATE_EPOCH #28757

pull achow101 wants to merge 1 commits into bitcoin:master from achow101:macos-zip-recursive changing 1 files +5 −1
  1. achow101 commented at 6:30 pm on October 30, 2023: member

    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.

  2. achow101 added the label Needs backport (26.x) on Oct 30, 2023
  3. achow101 added this to the milestone 26.0 on Oct 30, 2023
  4. DrahtBot commented at 6:30 pm on October 30, 2023: contributor

    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.

  5. hebasto commented at 6:36 pm on October 30, 2023: member
    Did you test reproducibility?
  6. achow101 commented at 6:37 pm on October 30, 2023: member

    Did you test reproducibility?

    Not yet

  7. achow101 force-pushed on Oct 30, 2023
  8. achow101 renamed this:
    guix: Zip needs the recursive flag
    guix: Zip needs to include all files and set time to SOURCE_DATE_EPOCH
    on Oct 30, 2023
  9. achow101 commented at 7:39 pm on October 30, 2023: member
    Updated to be reproducible and follow the same pattern done for all of the other zip files guix produces.
  10. achow101 commented at 7:40 pm on October 30, 2023: member

    Results for 26.0rc1:

    0cf4f700114c93f2175f52c9e0edbdb5702a7b5881b2a89d92d3f58029e409e6c  guix-build-26.0rc1/output/arm64-apple-darwin-codesigned/bitcoin-26.0rc1-arm64-apple-darwin.zip
    13bb35035416a7359d9402e9d3061b88a337a7f95cadff063361cbd4b93ec3d05  guix-build-26.0rc1/output/x86_64-apple-darwin-codesigned/bitcoin-26.0rc1-x86_64-apple-darwin.zip
    
  11. laanwj commented at 8:36 pm on October 30, 2023: member

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

    0cf4f700114c93f2175f52c9e0edbdb5702a7b5881b2a89d92d3f58029e409e6c  bitcoin-26.0rc1-arm64-apple-darwin.zip
    13bb35035416a7359d9402e9d3061b88a337a7f95cadff063361cbd4b93ec3d05  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.

  12. TheCharlatan approved
  13. TheCharlatan commented at 9:13 am on October 31, 2023: contributor

    ACK 83dd3d022602c03cb8b95ac58066a13637506d92

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

  14. hebasto commented at 9:15 am on October 31, 2023: member
    Concept ACK. Still testing.
  15. hebasto commented at 10:22 am on October 31, 2023: member

    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)

  16. fanquake commented at 2:00 pm on October 31, 2023: member
    Yea, we should nuke the dist/ here, otherwise, this looks good to me.
  17. guix: Zip needs to include all files with time as SOURCE_DATE_EPOCH
    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.
    f6f18eeaa8
  18. achow101 force-pushed on Oct 31, 2023
  19. achow101 commented at 3:36 pm on October 31, 2023: member

    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:

    0adc40abe61a6731b4d481d27b883731d282b61995b3ca401dea49385c89ff8ef  guix-build-26.0rc1/output/arm64-apple-darwin-codesigned/bitcoin-26.0rc1-arm64-apple-darwin.zip
    111ee5b21d4d0d411117a7e237d73d698170f0b18dd78ab1299499ae65abc3a1b  guix-build-26.0rc1/output/x86_64-apple-darwin-codesigned/bitcoin-26.0rc1-x86_64-apple-darwin.zip
    
  20. hebasto commented at 3:41 pm on October 31, 2023: member

    My hashes for f6f18eeaa88784e487e9bca8c5ace6c66bd721cc:

    0adc40abe61a6731b4d481d27b883731d282b61995b3ca401dea49385c89ff8ef  guix-build-26.0rc1/output/arm64-apple-darwin-codesigned/bitcoin-26.0rc1-arm64-apple-darwin.zip
    111ee5b21d4d0d411117a7e237d73d698170f0b18dd78ab1299499ae65abc3a1b  guix-build-26.0rc1/output/x86_64-apple-darwin-codesigned/bitcoin-26.0rc1-x86_64-apple-darwin.zip
    
  21. hebasto approved
  22. hebasto commented at 3:52 pm on October 31, 2023: member
    ACK f6f18eeaa88784e487e9bca8c5ace6c66bd721cc.
  23. DrahtBot requested review from TheCharlatan on Oct 31, 2023
  24. TheCharlatan approved
  25. TheCharlatan commented at 4:44 pm on October 31, 2023: contributor

    ACK f6f18eeaa88784e487e9bca8c5ace6c66bd721cc

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

  26. fanquake merged this on Oct 31, 2023
  27. fanquake closed this on Oct 31, 2023

  28. fanquake referenced this in commit b60a59bc60 on Oct 31, 2023
  29. fanquake removed the label Needs backport (26.x) on Oct 31, 2023
  30. DrahtBot added the label Build system on Oct 31, 2023
  31. fanquake commented at 4:47 pm on October 31, 2023: member
    Added to #28754.
  32. fanquake referenced this in commit deccc50631 on Oct 31, 2023

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-10-04 19:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me