Skip to content
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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Nov 29, 2017
Merged

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

merged 1 commit into from
Nov 29, 2017

Conversation

SimonSapin
Copy link
Contributor

@rust-highfive
Copy link
Collaborator

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.

@SimonSapin SimonSapin mentioned this pull request Nov 28, 2017
Merged
@kennytm
Copy link
Member

kennytm commented Nov 28, 2017

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 28, 2017

📌 Commit a6d1895 has been approved by kennytm

@kennytm kennytm 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
Copy link
Member

eddyb commented Nov 29, 2017

Doesn't this "conflict" with #46354?

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

rust-lang#45810 (comment)
@kennytm kennytm mentioned this pull request Nov 29, 2017
Merged
@kennytm
Copy link
Member

kennytm commented Nov 29, 2017

@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:master Nov 29, 2017
@SimonSapin SimonSapin deleted the patch-6 branch March 30, 2018 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: 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