Fix rustbuild --color conflict when building on Travis outside of Docker #45304
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
kennytm
added
the
S-waiting-on-author
kennytm
force-pushed
the
travis-color-color-conflict
branch
3 times, most recently
from
2967b4a
to
46b3803
Compare
kennytm
changed the title
kennytm
added
S-waiting-on-review
|
☔ The latest upstream changes (presumably #44792) made this pull request unmergeable. Please resolve the merge conflicts. |
kennytm
force-pushed
the
travis-color-color-conflict
branch
from
46b3803
to
ebbcad9
Compare
|
@bors: r+ rollup |
|
📌 Commit ebbcad9 has been approved by |
kennytm
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Oct 22, 2017
Fix rustbuild --color conflict when building on Travis outside of Docker When trying to build rust on Travis without using `stamp` or `docker`, both `RUSTC_COLOR=1` and `TRAVIS=true` will separately pass `--color always` to the command line. This causes the build to fail due to "*Option 'color' given more than once*". In this PR, the `RUSTC_COLOR=1` will not be passed in the CI environment.
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When trying to build rust on Travis without using
stampordocker, bothRUSTC_COLOR=1andTRAVIS=truewill separately pass--color alwaysto the command line. This causes the build to fail due to "Option 'color' given more than once".In this PR, the
RUSTC_COLOR=1will not be passed in the CI environment.