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.

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

Link a newer openssl from homebrew on OS X #218

Merged
merged 2 commits into from Feb 8, 2016

Conversation

@aneeshusa
Copy link
Member

aneeshusa commented Feb 6, 2016

This should be manually tested to a) make sure I didn't break the autoconf linkage, and b) to ensure the openssl linkage works properly.

Closes #210 (for real this time!)

Review on Reviewable

@aneeshusa
Copy link
Member Author

aneeshusa commented Feb 6, 2016

Any idea why Travis hasn't picked this up? Hard for me to test locally without #180 (and #181).

@jdm jdm closed this Feb 7, 2016
@jdm jdm reopened this Feb 7, 2016
@jdm
Copy link
Member

jdm commented Feb 7, 2016

Yeah, it was missing in the travis console for some reason. It appears to have been picked up now.

Also refactor servo-dependencies.sls slightly.
Closes #210 (for real this time!)
@aneeshusa aneeshusa force-pushed the aneeshusa:link-openssl-on-osx branch 4 times, most recently from 414fc30 to f982a8c Feb 7, 2016
Our OS X builders have administrator as the Homebrew owner, but
this is not the case on Travis.
@aneeshusa aneeshusa force-pushed the aneeshusa:link-openssl-on-osx branch from f982a8c to 7ceda87 Feb 7, 2016
@aneeshusa
Copy link
Member Author

aneeshusa commented Feb 7, 2016

I put in a fix for Travis and tested this locally on servo-macpro1, so this is ready for review.

Note to self: remember to update the wiki to remove the section about openssl on OS X when this is merged.

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Feb 8, 2016

@bors-servo r+

Thanks for your continued awesome work on our Salt infra!

@bors-servo
Copy link
Contributor

bors-servo commented Feb 8, 2016

📌 Commit 7ceda87 has been approved by larsbergstrom

@bors-servo
Copy link
Contributor

bors-servo commented Feb 8, 2016

Testing commit 7ceda87 with merge 611619c...

bors-servo added a commit that referenced this pull request Feb 8, 2016
Link a newer openssl from homebrew on OS X

This should be manually tested to a) make sure I didn't break the autoconf linkage, and b) to ensure the openssl linkage works properly.

Closes #210 (for real this time!)

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/218)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 8, 2016

☀️ Test successful - travis

@bors-servo bors-servo merged commit 7ceda87 into servo:master Feb 8, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@aneeshusa
Copy link
Member Author

aneeshusa commented Feb 8, 2016

Weird, I didn't get any emails about this 😕. Went ahead and updated the wiki.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.