Skip to content

[beta] Beta rollups#84382

Merged
bors merged 3 commits intorust-lang:betafrom
ehuss:update-beta-cargo
Apr 21, 2021
Merged

[beta] Beta rollups#84382
bors merged 3 commits intorust-lang:betafrom
ehuss:update-beta-cargo

Conversation

@ehuss
Copy link
Contributor

@ehuss ehuss commented Apr 21, 2021 •
edited
Loading

@ehuss ehuss self-assigned this Apr 21, 2021
@rust-highfive
Copy link
Contributor

rust-highfive commented Apr 21, 2021

⚠️ 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 Apr 21, 2021
@ehuss
Copy link
Contributor Author

ehuss commented Apr 21, 2021

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Apr 21, 2021

📌 Commit 6f3aa4b has been approved by ehuss

@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 Apr 21, 2021
@bors
Copy link
Collaborator

bors commented Apr 21, 2021

⌛ Testing commit 6f3aa4b with merge fd322444dfbd24a58374b75a9741e64c1454a000...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Apr 21, 2021

💔 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 Apr 21, 2021
@JohnTitor
Copy link
Member

JohnTitor commented Apr 21, 2021 

2021-04-21T07:13:49.8452066Z ##[section]Starting: Request a runner to run this job
2021-04-21T07:13:51.3106748Z Can't find any online and idle self-hosted runner in current repository that matches the required labels: 'ubuntu-latest-xl'
2021-04-21T07:13:51.3409630Z Can't find any online and idle self-hosted runner in current repository's organization account that matches the required labels: 'ubuntu-latest-xl'
2021-04-21T07:13:51.4229356Z Found online and idle hosted runner in current repository's organization account that matches the required labels: 'ubuntu-latest-xl'
2021-04-21T07:13:51.5484672Z ##[section]Finishing: Request a runner to run this job

@bors retry

@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 Apr 21, 2021
@bors
Copy link
Collaborator

bors commented Apr 21, 2021

⌛ Testing commit 6f3aa4b with merge 36f15fce79822f19369039ea97f26dbd61c34ffd...

@bors
Copy link
Collaborator

bors commented Apr 21, 2021

💔 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 Apr 21, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@m-ou-se
Copy link
Member

m-ou-se commented Apr 21, 2021

That error is unrelated to this PR and fixed once the tree re-opens (#84394).

@bors retry

@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 Apr 21, 2021
@m-ou-se
Copy link
Member

m-ou-se commented Apr 21, 2021

Oh wait, this is the beta branch. The fix needs to be backported first then.

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 21, 2021
@bors @ehuss
Auto merge of rust-lang#84394 - m-ou-se:upgrade-ci-dep-expat, r=Mark-…
97ffd54 
…Simulacrum

Upgrade `expat` dependency in riscv64 to newer version.

The old version was renamed to `expat-2.2.6-RENAMED-VULNERABLE-PLEASE-USE-2.3.0-INSTEAD`. :)

r? `@Mark-Simulacrum`
@Dylan-DPC @ehuss
Rollup merge of rust-lang#83678 - GuillaumeGomez:hack-Self-keyword-co…
9787d0c 
…nflict, r=jyn514

Fix Self keyword doc URL conflict on case insensitive file systems (until definitely fixed on rustdoc)

This is just a hack to allow rustup to work on macOS and windows again to distribute std documentation (hopefully once rust-lang/rfcs#3097 or an equivalent is merged).

Fixes rust-lang#80504. Prevents rust-lang#83154 and rust-lang/rustup#2694 in future releases.

cc ``@kinnison``
r? ``@jyn514``
@ehuss ehuss changed the title [beta] Update cargo [beta] Beta rollups Apr 21, 2021
@ehuss
Copy link
Contributor Author

ehuss commented Apr 21, 2021

Added #84394 and #83678

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 21, 2021

📌 Commit 9787d0c has been approved by ehuss

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 21, 2021
@bors
Copy link
Collaborator

bors commented Apr 21, 2021

⌛ Testing commit 9787d0c with merge b2df13e...

@bors
Copy link
Collaborator

bors commented Apr 21, 2021

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing b2df13e to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 21, 2021
@bors bors merged commit b2df13e into rust-lang:beta Apr 21, 2021
@rustbot rustbot added this to the 1.52.0 milestone Apr 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@ehuss ehuss

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

Milestone

1.52.0

Development

Successfully merging this pull request may close these issues.

8 participants

@ehuss @rust-highfive @bors @rust-log-analyzer @JohnTitor @m-ou-se @rustbot @Dylan-DPC