Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix OSX non-deterministic dmg #8373

Merged
merged 1 commit into from
Jul 20, 2016
Merged

Fix OSX non-deterministic dmg #8373

merged 1 commit into from
Jul 20, 2016

Conversation

theuni
Copy link
Member

@theuni theuni commented Jul 19, 2016

I believe this is all that's necessary to fix the 0.13rc1 osx determinism issue.

Obviously needs backport to 0.13 branch.

@theuni
build: fix non-deterministic biplist
3b3ce25 
The non-deterministic ordering produced by biplist ends up in the .DS_Store
file that is included in the OSX dmg.
@luke-jr
Copy link
Member

luke-jr commented Jul 19, 2016

Makes sense. utACK

@maflcko maflcko added this to the 0.13.0 milestone Jul 19, 2016
@maflcko
Copy link
Member

maflcko commented Jul 19, 2016

Concept ACK

@achow101
Copy link
Member

achow101 commented Jul 19, 2016 •
edited
Loading

ACK 3b3ce25

Ran the gitian build twice and got the same results

9fa6b31128eee2cfa535774fe4eebaa384f0471c094ce6ee6aefe9aef93f134b bitcoin-0.13.99-osx-unsigned.dmg e2e33efea3d2c86d34391b3be20d032343b359909cdbe55b1153ba109ae5af4f bitcoin-0.13.99-osx-unsigned.tar.gz fc5a233b3be260ec7be63f699bbc128240ad190692cd5d4a82cc1352eb3c57df bitcoin-0.13.99-osx64.tar.gz 0269f915640886ba16c73450ab2dbcdde0304fa79807414c7e0cf4d4ba8f39df src/bitcoin-0.13.99.tar.gz ab0a5e271e81fb48cf355f866a105eca12713260e703da35330ae66e03336367 bitcoin-osx-0.13-res.yml

@theuni
Copy link
Member Author

theuni commented Jul 19, 2016

Matched @achow101's results:

9fa6b31128eee2cfa535774fe4eebaa384f0471c094ce6ee6aefe9aef93f134b  bitcoin-0.13.99-osx-unsigned.dmg
e2e33efea3d2c86d34391b3be20d032343b359909cdbe55b1153ba109ae5af4f  bitcoin-0.13.99-osx-unsigned.tar.gz
fc5a233b3be260ec7be63f699bbc128240ad190692cd5d4a82cc1352eb3c57df  bitcoin-0.13.99-osx64.tar.gz
0269f915640886ba16c73450ab2dbcdde0304fa79807414c7e0cf4d4ba8f39df  src/bitcoin-0.13.99.tar.gz
1f378788d2965cec1e0d6591f59288cc4344f5b9a328b6186bd41cf1a631bada  bitcoin-osx-0.13-res.yml

@paveljanik
Copy link
Contributor

utACK 3b3ce25

@laanwj
Copy link
Member

laanwj commented Jul 20, 2016

utACK 3b3ce25

@laanwj laanwj merged commit 3b3ce25 into bitcoin:master Jul 20, 2016
laanwj added a commit that referenced this pull request Jul 20, 2016
@laanwj
Merge #8373: Fix OSX non-deterministic dmg
c98abf2 
3b3ce25 build: fix non-deterministic biplist (Cory Fields)
laanwj pushed a commit that referenced this pull request Jul 20, 2016
@theuni @laanwj
build: fix non-deterministic biplist
1fe7f40 
The non-deterministic ordering produced by biplist ends up in the .DS_Store
file that is included in the OSX dmg.

Github-Pull: #8373
Rebased-From: 3b3ce25
codablock pushed a commit to codablock/dash that referenced this pull request Dec 9, 2017
@laanwj @codablock
Merge bitcoin#8373: Fix OSX non-deterministic dmg
38c12ff 
3b3ce25 build: fix non-deterministic biplist (Cory Fields)
codablock pushed a commit to codablock/dash that referenced this pull request Dec 11, 2017
@laanwj @codablock
Merge bitcoin#8373: Fix OSX non-deterministic dmg
4e0bb52 
3b3ce25 build: fix non-deterministic biplist (Cory Fields)
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
Build system
Projects
None yet
Milestone
0.13.0
Development

Successfully merging this pull request may close these issues.
6 participants
@theuni @luke-jr @maflcko @achow101 @paveljanik @laanwj