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
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev

Use correct Homebrew user on Travis

Our OS X builders have administrator as the Homebrew owner, but
this is not the case on Travis.
  • Loading branch information
aneeshusa committed Feb 7, 2016
commit 7ceda87b5e7fb0aec5f7f98ba2874bd85eb6f722
@@ -1 +1,4 @@
travis: True

homebrew:
user: travis
@@ -0,0 +1,10 @@
{%
set homebrew = salt['grains.filter_by']({
'defaults': {},
'Darwin': { 'user': 'administrator' }
},
base='defaults',
merge=salt.pillar.get('homebrew', {}),
grain='kernel'
)
%}
@@ -1,3 +1,5 @@
{% from 'map.jinja' import homebrew with context %}
servo-dependencies:
pkg.installed:
- pkgs:
@@ -46,7 +48,7 @@ servo-darwin-homebrew-versions-dependencies:
homebrew-link-autoconf:
cmd.run:
- name: 'brew link --overwrite autoconf'
- user: administrator
- user: {{ homebrew.user }}
- creates: /usr/local/Library/LinkedKegs/autoconf
- require:
- pkg: servo-dependencies
@@ -55,7 +57,7 @@ homebrew-link-autoconf:
homebrew-link-openssl:
cmd.run:
- name: 'brew link --force openssl'
- user: administrator
- user: {{ homebrew.user }}
- creates: /usr/local/Library/LinkedKegs/openssl
- require:
- pkg: servo-dependencies
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.