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
Mach bootstrap: Add more platforms #579
Merged
+30
−2
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.
Avoid some stuff for `mach bootstrap` on Ubuntu
- Loading branch information
commit 0b8abce77168f24bf0f5ab7ab5b3bc8df76b314c
| @@ -37,15 +37,17 @@ servo-dependencies: | ||
| - xserver-xorg-input-void | ||
| - xserver-xorg-video-dummy | ||
| {% endif %} | ||
| {% if salt['pillar.get']('fully_managed', True) %} | ||
| pip.installed: | ||
| - pkgs: | ||
| - ghp-import | ||
| - s3cmd | ||
| - require: | ||
| - pkg: pip | ||
| - pip: virtualenv | ||
| {% endif %} | ||
|
|
||
| {% if grains['os'] == 'Ubuntu' %} | ||
| {% if grains['os'] == 'Ubuntu' and grains['oscodename'] == 'trusty' %} | ||
| multiverse: | ||
| pkgrepo.managed: | ||
| - name: 'deb http://archive.ubuntu.com/ubuntu trusty multiverse' | ||
aneeshusa
Member
|
||
ProTip!
Use n and p to navigate between commits in a pull request.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Instead of gating on being Trusty, try replacing
trustyon this line with{{ grains['oscodename'] }}. I'm not 100% sure but I think it should work on Trusty and Xenial both.