Skip to content
This repository has been archived by the owner on Dec 16, 2024. It is now read-only.

Link a newer openssl from homebrew on OS X #218

Merged
merged 2 commits into from
Feb 8, 2016

Conversation

aneeshusa
Copy link
Contributor

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
Contributor Author

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 servo#210 (for real this time!)
@aneeshusa aneeshusa force-pushed the link-openssl-on-osx branch 4 times, most recently from 414fc30 to f982a8c Compare February 7, 2016 02:53
Our OS X builders have administrator as the Homebrew owner, but
this is not the case on Travis.
@aneeshusa aneeshusa force-pushed the link-openssl-on-osx branch from f982a8c to 7ceda87 Compare February 7, 2016 03:02
@aneeshusa
Copy link
Contributor Author

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

@bors-servo r+

Thanks for your continued awesome work on our Salt infra!

@bors-servo
Copy link
Contributor

📌 Commit 7ceda87 has been approved by larsbergstrom

@bors-servo
Copy link
Contributor

⌛ Testing commit 7ceda87 with merge 611619c...

bors-servo pushed 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

☀️ Test successful - travis

@bors-servo bors-servo merged commit 7ceda87 into servo:master Feb 8, 2016
@aneeshusa
Copy link
Contributor Author

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants