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

[beta] backport #110871

Merged
merged 7 commits into from
Apr 30, 2023
Merged

[beta] backport #110871

merged 7 commits into from
Apr 30, 2023

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Apr 26, 2023 •
edited
Loading

This PR backports:

Also bumps us to the latest released stable, 1.69.0.

r? @cuviper

@rustbot
Copy link
Collaborator

rustbot commented Apr 26, 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!
  • These commits modify submodules.

@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 Apr 26, 2023
@cuviper
Copy link
Member Author

cuviper commented Apr 27, 2023

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Apr 27, 2023

📌 Commit b50332c has been approved by cuviper

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 Apr 27, 2023
@cuviper
Copy link
Member Author

cuviper commented Apr 27, 2023

Stalling to add more approved backports.
@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 27, 2023
compiler-errors and others added 2 commits April 27, 2023 08:49
@compiler-errors @cuviper
Encode lifetime param spans too
53e5649 
(cherry picked from commit 24c2c07)
@onur-ozkan @cuviper
make sysroot finding compatible with multiarch systems
b93f9e5 
Signed-off-by: ozkanonur <work@onurozkan.dev>
(cherry picked from commit 2e98368)
@cuviper
Copy link
Member Author

cuviper commented Apr 27, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Apr 27, 2023

📌 Commit b93f9e5 has been approved by cuviper

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

bors commented Apr 28, 2023

⌛ Testing commit b93f9e5 with merge ed9ac2862f231e246b3446b330ec50f7a3ceb550...

@bors
Copy link
Contributor

bors commented Apr 28, 2023

💔 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 28, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@ehuss
Copy link
Contributor

ehuss commented Apr 28, 2023

@bors treeclosed=100

Something is wrong with python and awscli

@ehuss
Copy link
Contributor

ehuss commented Apr 28, 2023

@bors retry

python setuptools issue

@bors
Copy link
Contributor

bors commented Apr 28, 2023

💔 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 28, 2023
@cuviper
Copy link
Member Author

cuviper commented Apr 28, 2023

Oh, whoops, I'll need to backport the CI fix too...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@ehuss @cuviper
Update awscli
12fcfa0 
(cherry picked from commit dd6314f)
@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 Apr 28, 2023
@cuviper
Copy link
Member Author

cuviper commented Apr 28, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Apr 28, 2023

📌 Commit 12fcfa0 has been approved by cuviper

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 Apr 28, 2023
@cuviper cuviper mentioned this pull request Apr 28, 2023
Merged
@bors
Copy link
Contributor

bors commented Apr 29, 2023

⌛ Testing commit 12fcfa0 with merge 6454d8cd318f842028b6d13e4aa4dd0a9bd54c83...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Apr 29, 2023

💔 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 29, 2023
@ehuss
Copy link
Contributor

ehuss commented Apr 29, 2023

@cuviper I had recommended backporting #110361 to avoid that error.

@cuviper
Copy link
Member Author

cuviper commented Apr 29, 2023

@ehuss, thanks, I've added it. It may help in the future to make sure there's a team label to review the nomination, but this case is simple enough that I feel comfortable approving it myself.

@bors r+

@bors
Copy link
Contributor

bors commented Apr 29, 2023

📌 Commit 4e2f52c has been approved by cuviper

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 Apr 29, 2023
@bors
Copy link
Contributor

bors commented Apr 30, 2023

⌛ Testing commit 4e2f52c with merge 071f14b...

@bors
Copy link
Contributor

bors commented Apr 30, 2023

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 071f14b to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 30, 2023
@bors bors merged commit 071f14b into rust-lang:beta Apr 30, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
8 participants
@cuviper @rustbot @bors @rust-log-analyzer @ehuss @compiler-errors @nikic @onur-ozkan