Skip to content

Update comment on alternate builds in .travis.yml - #46330

Merged
bors merged 1 commit into
rust-lang:masterfrom
SimonSapin:patch-6
Nov 29, 2017
Merged

Update comment on alternate builds in .travis.yml#46330
bors merged 1 commit into
rust-lang:masterfrom
SimonSapin:patch-6

Conversation

@SimonSapin

@SimonSapinSimonSapin commented Nov 28, 2017

Copy link
Copy Markdown
Contributor

@rust-highfive

rust-highfive commented Nov 28, 2017

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@SimonSapinSimonSapin mentioned this pull request Nov 28, 2017
Merged
@kennytm

kennytm commented Nov 28, 2017

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Nov 28, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit a6d1895 has been approved by kennytm

@kennytmkennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 28, 2017
@eddyb

eddyb commented Nov 29, 2017

Copy link
Copy Markdown
Contributor

Doesn't this "conflict" with #46354?

kennytm added a commit to kennytm/rust that referenced this pull request Nov 29, 2017
@kennytm
Rollup merge ofrust-lang#46330- SimonSapin:patch-6, r=kennytm
1e49d4a
Update comment on alternate builds in .travis.yml
rust-lang#45810 (comment)
@kennytmkennytm mentioned this pull request Nov 29, 2017
Merged
@kennytm

kennytm commented Nov 29, 2017

Copy link
Copy Markdown
Member

@eddyb This PR just updates the comment describing what does an "alt" build means, and in #46354 the alt build does get uploaded to a different folder, so there is are no conflicts gitwise or semantic-wise.

bors added a commit that referenced this pull request Nov 29, 2017
@bors
Auto merge of#46362- kennytm:rollup, r=kennytm
0a2e9ad
Rollup of 10 pull requests
- Successful merges: #45969, #46077, #46219, #46287, #46293, #46322, #46323, #46330, #46354, #46356
- Failed merges:
@bors
bors merged commit a6d1895 into rust-lang:masterNov 29, 2017
@SimonSapin
SimonSapin deleted the patch-6 branch March 30, 2018 13:52
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nikomatsakisnikomatsakis

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@SimonSapin@rust-highfive@kennytm@bors@eddyb@nikomatsakis