Skip to content

/ saltfs

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

Install zlib on OSX. #690

Merged
merged 1 commit into from Jun 7, 2017
Merged

Install zlib on OSX. #690

merged 1 commit into from Jun 7, 2017

Conversation

@emilio
Copy link
Member

emilio commented Jun 7, 2017 •
edited by larsbergstrom

Needed to update osmesa (servo/servo#14584), which reports a not enough up-to-date zlib.

This change is Reviewable
@emilio
Install zlib on OSX.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
Loading status checks…
b2a9891
@emilio
Copy link
Member Author

emilio commented Jun 7, 2017

r? @larsbergstrom
@highfive highfive assigned larsbergstrom and unassigned aneeshusa Jun 7, 2017
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jun 7, 2017

Do we also need to update the servo readme for developers?
https://github.com/servo/servo/#on-os-x-homebrew

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2017

📌 Commit b2a9891 has been approved by larsbergstrom
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2017

⌛ Testing commit b2a9891 with merge 1804bc8...
bors-servo added a commit that referenced this pull request Jun 7, 2017
@bors-servo
Auto merge of #690 - servo:zlib-osx, r=larsbergstrom
Loading status checks…
1804bc8 
Install zlib on OSX.

Needed to update osmesa (servo/servo#14584), which reports a not enough up-to-date zlib.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/690)
<!-- Reviewable:end -->
@emilio
Copy link
Member Author

emilio commented Jun 7, 2017

Perhaps! will make sure to do so when landing the update
@emilio emilio mentioned this pull request Jun 7, 2017
Merged
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2017

💔 Test failed - status-travis
@aneeshusa
Copy link
Member

aneeshusa commented Jun 7, 2017

@bors-servo retry

  • Intermittent failure of repo.saltstack.com
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jun 7, 2017

@edunham Once this lands, could you please roll it out to the mac builders?
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2017

⌛ Testing commit b2a9891 with merge da4935e...
bors-servo added a commit that referenced this pull request Jun 7, 2017
@bors-servo
Auto merge of #690 - servo:zlib-osx, r=larsbergstrom
Loading status checks…
da4935e 
Install zlib on OSX.

Needed to update osmesa (servo/servo#14584), which reports a not enough up-to-date zlib.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/690)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2017

☀️ Test successful - status-travis
Approved by: larsbergstrom
Pushing da4935e to master...
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2017

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jun 7, 2017

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2017

⌛ Testing commit b2a9891 with merge a21db0f...
bors-servo added a commit that referenced this pull request Jun 7, 2017
@bors-servo
Auto merge of #690 - servo:zlib-osx, r=larsbergstrom
Loading status checks…
a21db0f 
Install zlib on OSX.

Needed to update osmesa (servo/servo#14584), which reports a not enough up-to-date zlib.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/690)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2017

☀️ Test successful - status-travis
Approved by: larsbergstrom
Pushing a21db0f to master...
@bors-servo bors-servo merged commit b2a9891 into master Jun 7, 2017
3 checks passed
3 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Jun 7, 2017
Closed
@aneeshusa
Copy link
Member

aneeshusa commented Jun 22, 2017

This has been rolled out to all of the Mac builders.
@emilio emilio deleted the zlib-osx branch Jun 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@larsbergstrom larsbergstrom

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@emilio @larsbergstrom @bors-servo @aneeshusa @highfive
You can’t perform that action at this time.