Skip to content

Conversation

@kennytm
Copy link
Member

@kennytm kennytm commented Oct 15, 2017

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.

@rust-highfive
Copy link
Contributor

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@kennytm kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 15, 2017
@kennytm kennytm force-pushed the travis-color-color-conflict branch 3 times, most recently from 2967b4a to 46b3803 Compare October 15, 2017 13:28
@kennytm kennytm changed the title [WIP] Fix rustbuild --color conflict when building on Travis outside of Docker Fix rustbuild --color conflict when building on Travis outside of Docker Oct 15, 2017
@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 19, 2017
@bors
Copy link
Collaborator

bors commented Oct 20, 2017

☔ The latest upstream changes (presumably #44792) made this pull request unmergeable. Please resolve the merge conflicts.

@kennytm kennytm force-pushed the travis-color-color-conflict branch from 46b3803 to ebbcad9 Compare October 20, 2017 20:55
@aturon
Copy link
Contributor

aturon commented Oct 21, 2017

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 21, 2017

📌 Commit ebbcad9 has been approved by aturon

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 21, 2017
@bors
Copy link
Collaborator

bors commented Oct 22, 2017

⌛ Testing commit ebbcad9 with merge 1babcd0...

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.
@bors
Copy link
Collaborator

bors commented Oct 22, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: aturon
Pushing 1babcd0 to master...

@bors bors merged commit ebbcad9 into rust-lang:master Oct 22, 2017
@kennytm kennytm deleted the travis-color-color-conflict branch October 22, 2017 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants