Skip to content

[beta] backport cargo #92839

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
Closed
wants to merge 1 commit into from
Closed

[beta] backport cargo #92839

wants to merge 1 commit into from

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Jan 13, 2022 •
edited
Loading

backport cargo 2e4932801996a8799be8648a8858701e1ee8697a for 1.59.0-beta

@rust-highfive
Copy link
Contributor

Updates src/tools/cargo.

cc @ehuss

@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Contributor

⚠️ 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 Jan 13, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@weihanglo
Copy link
Member Author

I followed this guide: https://forge.rust-lang.org/release/backporting.html#beta-backporting-in-rust-langcargo, but cannot figure out how the channel switch on CI works. 😞

@ehuss
Copy link
Contributor

ehuss commented Jan 13, 2022

This will need to wait until #92734 merges. After beta is branched (which was very recent), the release team has to push a PR through to update it before anything else can be merged to the beta branch. Sometimes that process is a little bumpy, as in this case. All tools must be functional on the beta branch, but RLS is currently broken.

@ehuss
Copy link
Contributor

ehuss commented Jan 13, 2022

Looks like #92734 landed, so this should be able to go.

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Jan 13, 2022

📌 Commit 5ecf27913fcc54dc7b01c24934cb74b8fe77c9d0 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 Jan 13, 2022
@ehuss ehuss added this to the 1.59.0 milestone Jan 13, 2022
@ehuss ehuss added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 13, 2022
@weihanglo weihanglo force-pushed the beta-backport-cargo branch from 5ecf279 to 57e5727 Compare January 15, 2022 03:58
@weihanglo
Copy link
Member Author

Should good to go, @ehuss. Take your time. No rush 🙂

@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jan 17, 2022
Merged
@Mark-Simulacrum
Copy link
Member

Closing in favor of #93010.

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 19, 2022
@bors
Auto merge of rust-lang#93010 - Mark-Simulacrum:beta-next, r=Mark-Sim…
98a701b 
…ulacrum

[beta] rollup

This rolls up the following bumps onto the beta branch; no backports in this PR.

*  [beta] Bootstrap update rust-lang#92888
*  [beta] backport cargo rust-lang#92839

r? `@Mark-Simulacrum`
@weihanglo weihanglo deleted the beta-backport-cargo branch July 3, 2022 05:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.59.0
Development

Successfully merging this pull request may close these issues.
6 participants
@weihanglo @rust-highfive @rust-log-analyzer @ehuss @bors @Mark-Simulacrum