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.86] Update cargo #137507

Merged
merged 1 commit into from
Feb 27, 2025
Merged

[beta-1.86] Update cargo #137507

merged 1 commit into from
Feb 27, 2025

Conversation

weihanglo
Copy link
Member

1 commits in ce948f4616e3d4277e30c75c8bb01e094910df39..fcb465caf719e68f05671947db75a66ca7fadb2a
2025-02-14 20:32:07 +0000 to 2025-02-23 08:30:05 -0800

@weihanglo weihanglo self-assigned this Feb 24, 2025
@rustbot
Copy link
Collaborator

rustbot commented Feb 24, 2025

⚠️ Warning ⚠️

  • These commits modify submodules.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 24, 2025
@rustbot
Copy link
Collaborator

rustbot commented Feb 24, 2025

Some changes occurred in src/tools/cargo

cc @ehuss

@weihanglo
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Feb 24, 2025

📌 Commit 9448629 has been approved by weihanglo

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 Feb 24, 2025
github-merge-queue bot pushed a commit to rust-lang/cargo that referenced this pull request Feb 25, 2025
### What does this PR try to resolve?

After this, Cargo in the official Rust distribution will have a hard
dependency on libatomic on 32-bit platforms, until upstream issues get
resolved.

See
<#13546 (comment)>
for more details.

Fixes #13546

### How should we test and review this PR?

I leave the version requirements in Cargo.toml to inclue old v1
versions,
in case people really want to build cargo with the EOL OpenSSL v1.

Also, I am not going to pull back
<rust-lang/rust#137507>, unless someone thinks
it is needed.
@DianQK
Copy link
Member

DianQK commented Feb 27, 2025

@bors p=1 (beta)

@bors
Copy link
Contributor

bors commented Feb 27, 2025

⌛ Testing commit 9448629 with merge 42212a5...

@bors
Copy link
Contributor

bors commented Feb 27, 2025

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 42212a5 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 27, 2025
@bors bors merged commit 42212a5 into rust-lang:beta Feb 27, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 27, 2025
@weihanglo weihanglo deleted the update-beta-cargo branch February 27, 2025 16:30
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants