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-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024" #14366

Merged
merged 3 commits into from
Aug 14, 2024
Merged

[beta-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024" #14366

merged 3 commits into from
Aug 14, 2024

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Aug 7, 2024 •
edited
Loading

Beta backports

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

@rustbot
Copy link
Collaborator

rustbot commented Aug 7, 2024

r? @ehuss

rustbot has assigned @ehuss.
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 Aug 7, 2024

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.81.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 Aug 7, 2024
@weihanglo
Copy link
Member Author

This is not yet accepted. See #14283 (comment)

@weihanglo weihanglo changed the title [beta-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024" [DONT MERGE] [beta-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024" Aug 7, 2024
@traviscross
Copy link

@rustbot labels +I-nominated-to-discuss

The context here is that the bug being fixed by this backport precludes the start of the migration of rustc itself to Rust 2024. This migration was already in the works and would be delayed by about a month if this backport does not happen. Migrating rustc to Rust 2024 is part of the testing and validation of the new edition. From an edition team perspective, not setting things back would be meaningful and helpful to shipping the edition.

cc @joshtriplett @compiler-errors @rust-lang/cargo

@rustbot rustbot added the I-nominated-to-discuss To be discussed during issue triage on the next Cargo team meeting label Aug 7, 2024
@weihanglo weihanglo mentioned this pull request Aug 7, 2024
Merged
@weihanglo
Copy link
Member Author

From #14283 (comment):

If other people have time to do the analysis and are ok with the backport, go for it.

I've done the analysis. The master branch doesn't seem to diverge from rust-1.81.0 in this module, so should be safe to backport whatever in master. If I understand Ed's words correctly, we just need people to sign-off. Although the Cargo project doesn't really follow a formal process like rustc backport process, I am fine with going through an FCP for it.

@epage epage mentioned this pull request Aug 7, 2024
Merged
bors added a commit that referenced this pull request Aug 7, 2024
@bors
Auto merge of #14368 - epage:beta-vendor, r=weihanglo
f58aa3b 
[beta-1.81] fix(vendor): Strip excluded build targets

Beta backports

* #14367

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

* Ignore `build_std::basic` test (see also #14366)
* 830db6f (#14341, see also #14366)
@weihanglo weihanglo changed the title [DONT MERGE] [beta-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024" [beta-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024" Aug 13, 2024
@weihanglo weihanglo marked this pull request as ready for review August 13, 2024 14:23
@joshtriplett
Copy link
Member

We discussed this in today's @rust-lang/cargo meeting, and agreed to the beta-backport.

ping @traviscross.

@weihanglo weihanglo removed the I-nominated-to-discuss To be discussed during issue triage on the next Cargo team meeting label Aug 13, 2024
@weihanglo
Copy link
Member Author

I've reviewed it. Josh did as well. We need someone to r+ and we're good.

@epage
Copy link
Contributor

epage commented Aug 14, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Aug 14, 2024

📌 Commit 017ce90 has been approved by epage

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 Aug 14, 2024
bors added a commit that referenced this pull request Aug 14, 2024
@bors
Auto merge of #14366 - weihanglo:beta-1.81-backport, r=epage
2d826af 
[beta-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024"

Beta backports

* #14295

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

* Ignore `build_std::basic` test
* 830db6f (#14341)
@bors
Copy link
Contributor

bors commented Aug 14, 2024

⌛ Testing commit 017ce90 with merge 2d826af...

@bors
Copy link
Contributor

bors commented Aug 14, 2024

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 14, 2024
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 14, 2024
@weihanglo weihanglo force-pushed the beta-1.81-backport branch 2 times, most recently from 517a88b to 017ce90 Compare August 14, 2024 15:47
@weihanglo
Copy link
Member Author

@epage Any change for making #14374 into beta? I can cherry pick those PRs then if we don't want to backport #14374.

@epage
Copy link
Contributor

epage commented Aug 14, 2024

I'd go ahead and cherry-pick

@epage
Copy link
Contributor

epage commented Aug 14, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Aug 14, 2024

📌 Commit a2ee632 has been approved by epage

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 Aug 14, 2024
@bors
Copy link
Contributor

bors commented Aug 14, 2024

⌛ Testing commit a2ee632 with merge d585829...

@bors
Copy link
Contributor

bors commented Aug 14, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing d585829 to rust-1.81.0...

@bors bors merged commit d585829 into rust-lang:rust-1.81.0 Aug 14, 2024
22 checks passed
@weihanglo weihanglo mentioned this pull request Aug 20, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 21, 2024
@bors
Auto merge of rust-lang#129335 - weihanglo:update-beta-cargo, r=weiha…
b5fd9f6 
…nglo

[beta-1.81] Update cargo

3 commits in ca2346bd3c7f51e82964aaf7e47cdf770047b6ab..2dbb1af80a2914475ba76827a312e29cedfa6b2f
2024-07-31 19:33:19 +0000 to 2024-08-20 18:24:58 +0000
- [beta-1.81] chore(deps): update rust crate gix to 0.64.0 (rust-lang/cargo#14431)
- [beta-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024" (rust-lang/cargo#14366)
- [beta-1.81] fix(vendor): Strip excluded build targets (rust-lang/cargo#14368)

r? ghost
@rustbot rustbot added this to the 1.81.0 milestone Aug 21, 2024
@weihanglo weihanglo deleted the beta-1.81-backport branch October 9, 2024 00:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ehuss ehuss

Labels
A-manifest Area: Cargo.toml issues 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.81.0
Development

Successfully merging this pull request may close these issues.
8 participants
@weihanglo @rustbot @traviscross @joshtriplett @epage @bors @ehuss @Urgau