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-1.69] backport #11820 #11823

Merged
merged 2 commits into from
Mar 10, 2023
Merged

[beta-1.69] backport #11820 #11823

merged 2 commits into from
Mar 10, 2023

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Mar 9, 2023

Beta backports:

In order to make CI pass, the following PRs are also cherry-picked:

Bump crates-io to 0.36.0

This was an overlook of rust-lang#11600

Since we already got rust-lang#11806 to backport, I guess it is not harmful to <https://github.com/rust-lang/cargo/labels/beta-nominated> this as well.  Maybe it do need a backport as `src/cargo/ops/registry.rs` use a new public API from that PR.

BTW, please help check if it is really a breaking change.
@rustbot
Copy link
Collaborator

rustbot commented Mar 9, 2023

r? @ehuss

(rustbot has picked a reviewer for you, use r? to override)

@rustbot
Copy link
Collaborator

rustbot commented Mar 9, 2023

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.69.0. Please double check that you specified the right target!

@rustbot rustbot added A-interacts-with-crates.io Area: interaction with registries S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 9, 2023
@ehuss
Copy link
Contributor

ehuss commented Mar 9, 2023

Looks like you will also need to include #11817.

@rustbot rustbot added the A-documenting-cargo-itself Area: Cargo's documentation label Mar 9, 2023
@ehuss
Copy link
Contributor

ehuss commented Mar 10, 2023

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Mar 10, 2023

📌 Commit 32dbbce has been approved by ehuss

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

bors commented Mar 10, 2023

⌛ Testing commit 32dbbce with merge 4a4d795...

@bors
Copy link
Contributor

bors commented Mar 10, 2023

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 4a4d795 to rust-1.69.0...

@bors bors merged commit 4a4d795 into rust-lang:rust-1.69.0 Mar 10, 2023
@weihanglo weihanglo deleted the rust-1.69.0 branch March 10, 2023 13:04
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 19, 2023
…nglo

[beta-1.69] cargo beta backports

3 commits in 9880b408a3af50c08fab3dbf4aa2a972df71e951..7b18c85808a6b45ec8364bf730617b6f13e0f9f8
2023-02-28 19:39:39 +0000 to 2023-03-17 12:29:33 +0000
- [beta-1.69] backport rust-lang/cargo#11824 (rust-lang/cargo#11863)
- [beta-1.69] backport rust-lang/cargo#11820 (rust-lang/cargo#11823)
- chore: Backport rust-lang/cargo#11630 to `1.69.0` (rust-lang/cargo#11806)

r? `@ghost`
@ehuss ehuss added this to the 1.69.0 milestone Mar 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-documenting-cargo-itself Area: Cargo's documentation A-interacts-with-crates.io Area: interaction with registries 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.

4 participants