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] Ensure we can package directories ending with '.rs' #15248

Merged
merged 1 commit into from
Mar 1, 2025

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Mar 1, 2025

Beta backports

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

…st-lang#15240)

### What does this PR try to resolve?

This likely only affects `-Zpackage-workspace` but it might have also
broken dependencies whose path ends with `.rs` as
well

This broke in rust-lang#14961

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

### Additional information
@rustbot
Copy link
Collaborator

rustbot commented Mar 1, 2025

r? @epage

rustbot has assigned @epage.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Mar 1, 2025

⚠️ Warning ⚠️

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

@rustbot rustbot added A-manifest Area: Cargo.toml issues S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 1, 2025
@rustbot rustbot added the A-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc. label Mar 1, 2025
@weihanglo
Copy link
Member Author

weihanglo commented Mar 1, 2025

Actually I forgot. We don't need to cherry pick for check-version-bump CI job.

@weihanglo weihanglo force-pushed the rust-1.86.0-beta-backport branch from aab431d to bdccfd8 Compare March 1, 2025 02:21
@epage epage enabled auto-merge March 1, 2025 02:42
@epage epage merged commit adf9b6a into rust-lang:rust-1.86.0 Mar 1, 2025
40 of 42 checks passed
@weihanglo weihanglo deleted the rust-1.86.0-beta-backport branch March 1, 2025 03:22
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 2, 2025
[beta] backports

- Pass vendored sources from bootstrap to generate-copyright rust-lang#137020
- Fix `-win7-windows-msvc` target since 26eeac1* rust-lang#137270
- skip submodule updating logics on tarballs rust-lang#137338
- Improve behavior of `IF_LET_RESCOPE` around temporaries and place expressions rust-lang#137444
- downgrade bootstrap `cc` rust-lang#137460
- Remove latest Windows SDK from 32-bit CI rust-lang#137753
- [beta-1.86] Ensure we can package directories ending with '.rs' (rust-lang/cargo#15248) rust-lang#137842

r? cuviper
@rustbot rustbot added this to the 1.86.0 milestone Mar 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc. A-manifest Area: Cargo.toml issues S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants