Skip to content

Bump bootstrap compiler#38503

Merged
bors merged 2 commits into
rust-lang:masterfrom
brson:bootstrap
Dec 29, 2016
Merged

Bump bootstrap compiler#38503
bors merged 2 commits into
rust-lang:masterfrom
brson:bootstrap

Conversation

@brson

@brson brson commented Dec 20, 2016

Copy link
Copy Markdown
Contributor

r? @alexcrichton

I'm not clear on whether cargo will need to additionally be bumped beyond what's in #38470

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

Yeah I'll handle Cargo once #38470 lands. I'm surprised we didn't have any stage0 business to remove!

@bors

bors commented Dec 20, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit e994a16 has been approved by alexcrichton

@bors

bors commented Dec 21, 2016

Copy link
Copy Markdown
Collaborator

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

@alexcrichton

Copy link
Copy Markdown
Member

@brson ah ok now that the PR landed you should be able to update the cargo rev to d55dbc44156498d6c1bc8b3a6aca4b5dc275510d, which is the rev on the rust-1.15.0 branch

@bors

bors commented Dec 22, 2016

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@alexcrichton alexcrichton force-pushed the bootstrap branch 2 times, most recently from 5707b41 to 1c01c04 Compare December 29, 2016 07:20
@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Dec 29, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 1c01c04 has been approved by alexcrichton

@bors

bors commented Dec 29, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1c01c04 with merge 98b67b4...

@bors

bors commented Dec 29, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@alexcrichton

alexcrichton commented Dec 29, 2016 via email

Copy link
Copy Markdown
Member

@bors

bors commented Dec 29, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1c01c04 with merge 71e5a4c...

@bors

bors commented Dec 29, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@alexcrichton alexcrichton force-pushed the bootstrap branch 2 times, most recently from 072c82f to 03bc2cf Compare December 29, 2016 16:47
@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Dec 29, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 03bc2cf has been approved by alexcrichton

@bors

bors commented Dec 29, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 03bc2cf with merge ab8d8f7...

@bors

bors commented Dec 29, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@alexcrichton

alexcrichton commented Dec 29, 2016 via email

Copy link
Copy Markdown
Member

@bors

bors commented Dec 29, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 03bc2cf with merge e7c788a...

bors added a commit that referenced this pull request Dec 29, 2016
Bump bootstrap compiler

r? @alexcrichton

I'm not clear on whether cargo will need to additionally be bumped beyond what's in #38470
@bors

bors commented Dec 29, 2016

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing e7c788a to master...

@bors bors merged commit 03bc2cf into rust-lang:master Dec 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants