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.

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

Fix OSX non-deterministic dmg #8373

Merged
merged 1 commit into from Jul 20, 2016

Conversation

Projects
None yet
6 participants
@theuni
Member

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.

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

This comment has been minimized.

Show comment
Hide comment
@luke-jr

luke-jr Jul 19, 2016

Member

Makes sense. utACK

Member

luke-jr commented Jul 19, 2016

Makes sense. utACK

@MarcoFalke MarcoFalke added this to the 0.13.0 milestone Jul 19, 2016

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Jul 19, 2016

Member

Concept ACK

Member

MarcoFalke commented Jul 19, 2016

Concept ACK

@achow101

This comment has been minimized.

Show comment
Hide comment
@achow101

achow101 Jul 19, 2016

Member

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

Member

achow101 commented Jul 19, 2016

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

This comment has been minimized.

Show comment
Hide comment
@theuni

theuni Jul 19, 2016

Member

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
Member

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

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Jul 20, 2016

Contributor

utACK 3b3ce25

Contributor

paveljanik commented Jul 20, 2016

utACK 3b3ce25

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jul 20, 2016

Member

utACK 3b3ce25

Member

laanwj commented Jul 20, 2016

utACK 3b3ce25

@laanwj laanwj merged commit 3b3ce25 into bitcoin:master Jul 20, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Jul 20, 2016

Merge #8373: Fix OSX non-deterministic dmg
3b3ce25 build: fix non-deterministic biplist (Cory Fields)

laanwj added a commit that referenced this pull request Jul 20, 2016

build: fix non-deterministic biplist
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 added a commit to codablock/dash that referenced this pull request Sep 19, 2017

Merge #8373: Fix OSX non-deterministic dmg
3b3ce25 build: fix non-deterministic biplist (Cory Fields)

codablock added a commit to codablock/dash that referenced this pull request Dec 9, 2017

Merge #8373: Fix OSX non-deterministic dmg
3b3ce25 build: fix non-deterministic biplist (Cory Fields)

codablock added a commit to codablock/dash that referenced this pull request Dec 9, 2017

Merge #8373: Fix OSX non-deterministic dmg
3b3ce25 build: fix non-deterministic biplist (Cory Fields)

codablock added a commit to codablock/dash that referenced this pull request Dec 11, 2017

Merge #8373: Fix OSX non-deterministic dmg
3b3ce25 build: fix non-deterministic biplist (Cory Fields)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment