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.

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

[beta] Update cargo #77953

Merged
merged 2 commits into from
Oct 15, 2020
Merged

[beta] Update cargo #77953

merged 2 commits into from
Oct 15, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Oct 14, 2020

1 commits in 75615f8e69f748d7ef0df7bc0b064a9b1f5c78b2..65cbdd2dc0b7e877577474b98b7d071308d0bb6f
2020-09-29 18:42:19 +0000 to 2020-10-14 16:10:15 +0000

This is primarily to bring in a fix for rust-lang/cargo#8517 which is starting to show up on rust-lang/rust's CI again.

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 14, 2020
@ehuss
Copy link
Contributor Author

ehuss commented Oct 14, 2020

@bors p=1

Since this is affecting CI.

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never p=5

We'll want to bump beta on master after this lands as well

@bors
Copy link
Contributor

bors commented Oct 14, 2020

📌 Commit 3a0de81 has been approved by Mark-Simulacrum

@bors bors 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 14, 2020
@bors
Copy link
Contributor

bors commented Oct 14, 2020

⌛ Testing commit 3a0de81 with merge 79f2b6c90d0b1c0f4ca7284d7272795af891e037...

@bors
Copy link
Contributor

bors commented Oct 14, 2020

💔 Test failed - checks-actions

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

Seems #77863 should be also backported to beta.

…albini

Remove `mark-i-m` from rustc-dev-guide maintainers

They aren't a maintainer anymore and it causes failure on our CI now: https://github.com/rust-lang-ci/rust/runs/1243600577
@ehuss
Copy link
Contributor Author

ehuss commented Oct 14, 2020

I've added #77863.

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Oct 15, 2020

📌 Commit e21ccdc has been approved by Mark-Simulacrum

@bors bors 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 15, 2020
@bors
Copy link
Contributor

bors commented Oct 15, 2020

⌛ Testing commit e21ccdc with merge 4708ac7...

@bors
Copy link
Contributor

bors commented Oct 15, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 4708ac7 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 15, 2020
@bors bors merged commit 4708ac7 into rust-lang:beta Oct 15, 2020
@rustbot rustbot added this to the 1.48.0 milestone Oct 15, 2020
@ehuss ehuss mentioned this pull request Oct 16, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Oct 17, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

6 participants