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] backport #109033

Merged
merged 10 commits into from
Mar 17, 2023
Merged

[beta] backport #109033

merged 10 commits into from
Mar 17, 2023

Conversation

Mark-Simulacrum
Copy link
Member

This PR backports:

It also bumps to the released stable.

r? @Mark-Simulacrum

@rustbot
Copy link
Collaborator

rustbot commented Mar 11, 2023

⚠️ 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!

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Mar 11, 2023
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Mar 12, 2023

📌 Commit 7bb904b has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 Mar 12, 2023
@bors
Copy link
Contributor

bors commented Mar 13, 2023

⌛ Testing commit 7bb904b with merge 076bd22e978ddb60b31ff21fda67b1cb896a6715...

@w-flo
Copy link

w-flo commented Mar 13, 2023

This doesn't have the CI fix, so dist-various-2 attempts to download 21,346 Ubuntu packages. But it got stuck, maybe the Ubuntu mirror blocked it.

Edit: bors says this timed out after 4 hours, but the actual CI job appears to have a timeout of 10 hours. So it would probably still be a good idea to cancel that job, so other things can be built.

Edit 2: The job had actually finished downloading all 88.8 GB of packages, but then failed in the extraction phase. The logs look like the job actually did this multiple times. Anyway, the job has finally failed now.

@bors
Copy link
Contributor

bors commented Mar 13, 2023

💥 Test timed out

@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 Mar 13, 2023
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Mar 16, 2023
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Mar 16, 2023

📌 Commit a9f609f has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 Mar 16, 2023
@Mark-Simulacrum Mark-Simulacrum removed the A-testsuite Area: The testsuite used to check the correctness of rustc label Mar 16, 2023
@bors
Copy link
Contributor

bors commented Mar 17, 2023

⌛ Testing commit a9f609f with merge 2602aa8...

@bors
Copy link
Contributor

bors commented Mar 17, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 2602aa8 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 17, 2023
@bors bors merged commit 2602aa8 into rust-lang:beta Mar 17, 2023
@rustbot rustbot added this to the 1.69.0 milestone Mar 17, 2023
@Mark-Simulacrum Mark-Simulacrum deleted the beta-backport branch March 18, 2023 15:17
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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants