Fix Vagrantfile after #374 #394
Conversation
aneeshusa
force-pushed
the
fix-Vagrantfile-after-374
branch
2 times, most recently
from
6f9dcfd
to
895859a
Compare
aneeshusa
force-pushed
the
fix-Vagrantfile-after-374
branch
from
14dc797
to
676dfec
Compare
|
r? @larsbergstrom or @edunham I haven't had a chance to figure out how to make the smoke test pass on Travis. However, we've gotten a large influx of new contributors that are trying to use the Vagrantfile and are running into the fact that it's broken, so I think it's important it gets fixed ASAP. (See here and here for examples.) I've updated this to include just the fix for now so we can make it easier for new contributors; the test can be added later. |
|
Caught another contributor at #434. |
|
Reviewed 2 of 2 files at r1. Comments from Reviewable |
|
☔ The latest upstream changes (presumably #420) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@bors-servo r+ @aneeshusa I think you're good to go on this once it's up to date. |
|
📌 Commit 98c983d has been approved by |
|
🔒 Merge conflict |
Environment variables are now passed as a list, instead of a string.
Originally, I restricted these scripts to pure sh to avoid too many compatibility issues between Linux and OS X, but I've changed my mind and now prefer using bash to gain a few nice features.
aneeshusa
force-pushed
the
fix-Vagrantfile-after-374
branch
from
98c983d
to
1a1eeb2
Compare
|
@bors-servo r=edunham |
|
📌 Commit 1a1eeb2 has been approved by |
Fix Vagrantfile after #374 This is the second time I've broken it, so also add a test. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/394) <!-- Reviewable:end -->
|
☀️ Test successful - travis |
This is the second time I've broken it, so also add a test.
This change is