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

Update Travis configuration to test all node types. #97

Merged
merged 15 commits into from Oct 28, 2015
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Fix usage of homebrew taps

When installing autoconf213 from the homebrew/versions tap, salt
correct installs the package but fails to verify its installation
because it compares 'homebrew/versions/autoconf213', which is the
specified package name, with 'autoconf213', which is the installed
package name. Use the brew.install module function as a workaround
until this functionality is added to pkg.installed or pkgrepo.

See: saltstack/salt#26414
  • Loading branch information
aneeshusa committed Oct 27, 2015
commit f61b4d8b84a8c2d0c4f490f0a2439126d33a593f
@@ -18,14 +18,26 @@ ttf-mscorefonts-installer:
- debconf: ttf-mscorefonts-installer
{% endif %}

{% if grains['kernel'] == 'Darwin' %}
# Workaround for https://github.com/saltstack/salt/issues/26414
servo-darwin-homebrew-versions-dependencies:
module.run:
- name: pkg.install
- pkgs:
- autoconf213
- taps:
- homebrew/versions
- require_in:
- pkg: servo-dependencies
{% endif %}

servo-dependencies:
pkg.installed:
- pkgs:
- cmake
- git
{% if grains['kernel'] == 'Darwin' %}
- pkg-config
- homebrew/versions/autoconf213
{% else %}
- libglib2.0-dev
- libgl1-mesa-dri
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.