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

Commit

Permalink
Use correct Homebrew user on Travis
Browse files Browse the repository at this point in the history
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
1 parent 22966af commit 7ceda87
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .travis/test_pillars/travis.sls
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
travis: True

homebrew:
user: travis
10 changes: 10 additions & 0 deletions map.jinja
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{%
set homebrew = salt['grains.filter_by']({
'defaults': {},
'Darwin': { 'user': 'administrator' }
},
base='defaults',
merge=salt.pillar.get('homebrew', {}),
grain='kernel'
)
%}
6 changes: 4 additions & 2 deletions servo-dependencies.sls
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{% from 'map.jinja' import homebrew with context %}
servo-dependencies:
pkg.installed:
- pkgs:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 7ceda87

Please sign in to comment.