Skip to content

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Mar 2, 2021

It is a #20470 follow up.

@hebasto
Copy link
Member Author

hebasto commented Mar 2, 2021

Guix build:

$ find output -type f -name *$(git rev-parse --short HEAD)*.* -print0 | sort -z | xargs -r0 sha256sum
c39d6081b90a28eb477ecff074d803888adb163eaad914d1ac767e96f8aa713d  output/bitcoin-d8b4e3b43832-osx64.tar.gz
1040e7b19e9fd482760e23d1fda199c89f96a77f3a07dae009b355c3412d0b64  output/bitcoin-d8b4e3b43832-osx-unsigned.dmg
ea29f074ba4a6b9707ceda4b8c2c1349f048788cfb06c44e72411ac7ae3f1907  output/bitcoin-d8b4e3b43832-osx-unsigned.tar.gz
09189d3408f3b313036214822142223f2e992006d619ba48bfaec8e907ab16ed  output/src/bitcoin-d8b4e3b43832.tar.gz

@practicalswift
Copy link
Contributor

cr ACK d8b4e3b: patch looks correct

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

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

Concept ACK

@hebasto
Copy link
Member Author

hebasto commented Mar 3, 2021

Updated d8b4e3b -> 7bbb409 (pr21337.01 -> pr21337.02, diff):

@hebasto
Copy link
Member Author

hebasto commented Mar 3, 2021

Guix build:

$ find output -type f -name *$(git rev-parse --short HEAD)*.* -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
ff897bb2b361a3e6e8d9a96add8010061b09bb5c0f880a7e86dd716da18d8f4a  output/bitcoin-7bbb409314c6-osx-unsigned.dmg
1b60543e7b9e5e4ea40cf4e454cea1d7570e7b814760b142a7f0f4de428e96d8  output/bitcoin-7bbb409314c6-osx-unsigned.tar.gz
c2a7960e19f06ed2f78b50e88c099956e590c4559026f2f68e92d1d7b28d5eba  output/bitcoin-7bbb409314c6-osx64.tar.gz
fb01097e36dc0b594c267bbd7ed222a24ce34f98c32be533eaaa8aab462189b1  output/src/bitcoin-7bbb409314c6.tar.gz

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

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

ACK 7bbb409 - thanks for noticing the leftovers. This looks ok to me. Guix builds look like they are matching:

bash-5.1# find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
ff897bb2b361a3e6e8d9a96add8010061b09bb5c0f880a7e86dd716da18d8f4a  output/bitcoin-7bbb409314c6-osx-unsigned.dmg
1b60543e7b9e5e4ea40cf4e454cea1d7570e7b814760b142a7f0f4de428e96d8  output/bitcoin-7bbb409314c6-osx-unsigned.tar.gz
c2a7960e19f06ed2f78b50e88c099956e590c4559026f2f68e92d1d7b28d5eba  output/bitcoin-7bbb409314c6-osx64.tar.gz
fb01097e36dc0b594c267bbd7ed222a24ce34f98c32be533eaaa8aab462189b1  output/src/bitcoin-7bbb409314c6.tar.gz

@dongcarl
Copy link
Contributor

dongcarl commented Mar 3, 2021

Concept ACK 7bbb409

Lovely! ☺️
I believe we can also remove libcap from the manifest?

@hebasto
Copy link
Member Author

hebasto commented Mar 3, 2021

Updated 7bbb409 -> c967fb7 (pr21337.02 -> pr21337.03, diff):

I believe we can also remove libcap from the manifest?


Guix build:

$ find output -type f -name *$(git rev-parse --short HEAD)*.* -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
2cece5e8cc7c5e97ea9691788b02fcc2b7b5a791db12de8e0ef0655ecbfe694d  output/bitcoin-c967fb7fb97a-osx-unsigned.dmg
b3c4f71a656ac1873a12b4a080d2cbc93b7e221ea298ebdb393b397c2c36d76e  output/bitcoin-c967fb7fb97a-osx-unsigned.tar.gz
b0244e16d42f606f91de9dc455c33b01341f03733a0c48c9b2db27a98d02afb7  output/bitcoin-c967fb7fb97a-osx64.tar.gz
2f8d12a78e03f9a3d2971fb9bc8ff9794587557b02a6773992df860041e989d3  output/src/bitcoin-c967fb7fb97a.tar.gz

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

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

ACK c967fb7

Guix builds at c967fb7:

bash-5.1# find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
2cece5e8cc7c5e97ea9691788b02fcc2b7b5a791db12de8e0ef0655ecbfe694d  output/bitcoin-c967fb7fb97a-osx-unsigned.dmg
b3c4f71a656ac1873a12b4a080d2cbc93b7e221ea298ebdb393b397c2c36d76e  output/bitcoin-c967fb7fb97a-osx-unsigned.tar.gz
b0244e16d42f606f91de9dc455c33b01341f03733a0c48c9b2db27a98d02afb7  output/bitcoin-c967fb7fb97a-osx64.tar.gz
2f8d12a78e03f9a3d2971fb9bc8ff9794587557b02a6773992df860041e989d3  output/src/bitcoin-c967fb7fb97a.tar.gz

@laanwj
Copy link
Member

laanwj commented Mar 4, 2021

$ find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
2cece5e8cc7c5e97ea9691788b02fcc2b7b5a791db12de8e0ef0655ecbfe694d  output/bitcoin-c967fb7fb97a-osx-unsigned.dmg
56c4885e2fd20b09f2acd455ec4c6644a5afc9e7f51803933894b3ed77ed68bc  output/bitcoin-c967fb7fb97a-osx-unsigned.tar.gz
b0244e16d42f606f91de9dc455c33b01341f03733a0c48c9b2db27a98d02afb7  output/bitcoin-c967fb7fb97a-osx64.tar.gz
2f8d12a78e03f9a3d2971fb9bc8ff9794587557b02a6773992df860041e989d3  output/src/bitcoin-c967fb7fb97a.tar.gz

It looks like my output/bitcoin-c967fb7fb97a-osx-unsigned.tar.gz is different (…d68bc instead of …6d76e). In case anyone wants to compare it can be found here. The others match.

@fanquake
Copy link
Member

fanquake commented Mar 4, 2021

@laanwj that same difference is also popping up elsewhere, and iirc is related to the last Guix update. It should be fixed in the one of the next Guix PRs, but shouldn't block changes here.

@laanwj
Copy link
Member

laanwj commented Mar 4, 2021

Ok, good to know, will continue to merge this then. I just hoped posting the output would be useful to resolve determinism issues.

@laanwj laanwj merged commit b4d2265 into bitcoin:master Mar 4, 2021
@hebasto hebasto deleted the 210302-cdrkit branch March 4, 2021 15:10
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Mar 4, 2021
c967fb7 guix: Remove libcap from manifest (Hennadii Stepanov)
7bbb409 guix: Update darwin native packages dependencies (Hennadii Stepanov)

Pull request description:

  It is a bitcoin#20470 follow up.

ACKs for top commit:
  fanquake:
    ACK c967fb7

Tree-SHA512: 66ce05770f578ba61a44c58747c5a2669f425a989ed987838058bd86e3b49e342ac5a4f8852fc49f2b3a86b58fb6a340fdf3e34c1fc19bdab910729febba4bc7
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
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.

7 participants