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

Support vendoring with different revs from same git repo #10690

Merged
merged 2 commits into from
Dec 26, 2022
Merged

Support vendoring with different revs from same git repo #10690

merged 2 commits into from
Dec 26, 2022

Conversation

AtkinsChang
Copy link
Contributor

What does this PR try to resolve?

Fixes #10667

How should we test and review this PR?

test case is included

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ehuss (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 21, 2022
@bors
Copy link
Contributor

bors commented Nov 27, 2022

☔ The latest upstream changes (presumably #11387) made this pull request unmergeable. Please resolve the merge conflicts.

ehuss
ehuss reviewed Dec 11, 2022
View reviewed changes
Copy link
Contributor

@ehuss ehuss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I apologize for the very long radio silence. This PR fell through the cracks.

tests/testsuite/vendor.rs Outdated Show resolved Hide resolved
src/cargo/ops/vendor.rs Outdated Show resolved Hide resolved
tests/testsuite/vendor.rs Outdated Show resolved Hide resolved
@ehuss ehuss added S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 11, 2022
@AtkinsChang
Copy link
Contributor Author

Rebased with suggested changes.

@AtkinsChang AtkinsChang requested a review from ehuss December 21, 2022 03:03
@AtkinsChang
Copy link
Contributor Author

cc @ehuss

@Rustin170506
Copy link
Member

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. labels Dec 26, 2022
Rustin170506
Rustin170506 approved these changes Dec 26, 2022
View reviewed changes
Copy link
Member

@Rustin170506 Rustin170506 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! Thanks!

weihanglo
weihanglo approved these changes Dec 26, 2022
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me as well. Thanks @hi-rustin for helping the review.

@weihanglo
Copy link
Member

@bors r=hi-rustin

@bors
Copy link
Contributor

bors commented Dec 26, 2022

📌 Commit f114298 has been approved by hi-rustin

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 Dec 26, 2022
@bors
Copy link
Contributor

bors commented Dec 26, 2022

⌛ Testing commit f114298 with merge 5a574d3...

@bors
Copy link
Contributor

bors commented Dec 26, 2022

☀️ Test successful - checks-actions
Approved by: hi-rustin
Pushing 5a574d3 to master...

@bors bors merged commit 5a574d3 into rust-lang:master Dec 26, 2022
@weihanglo weihanglo mentioned this pull request Dec 31, 2022
Merged
weihanglo added a commit to weihanglo/rust that referenced this pull request Jan 4, 2023
@weihanglo
Update cargo
6306fd3 
8 commits in 2381cbdb4e9b07090f552d34a44a529b6e620e44..8c460b2237a6359a7e3335890db8da049bdd62fc
2022-12-23 12:19:27 +0000 to 2023-01-04 14:30:01 +0000
- test: revive nightly plugin tests to work (rust-lang/cargo#11534)
- Add note to release notes about rejecting multiple registries. (rust-lang/cargo#11531)
- Fix a typo `fresheness` -> `freshness` (rust-lang/cargo#11529)
- Reasons for rebuilding (rust-lang/cargo#11407)
- Asymmetric tokens (rust-lang/cargo#10771)
- Use proper git URL for GitHub repos (rust-lang/cargo#11517)
- Add `registry.default` example (rust-lang/cargo#11516)
- Support vendoring with different revs from same git repo (rust-lang/cargo#10690)

Also update license exceptions and permitted dependencies
for new cargo dependency "pasetors".

A new dependency `getrandom` is added into `rustc-workspace-hacks`,
since it requires feature `js`.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 4, 2023
@bors
Auto merge of rust-lang#106330 - weihanglo:update-cargo, r=weihanglo
659e169 
Update cargo

8 commits in 2381cbdb4e9b07090f552d34a44a529b6e620e44..8c460b2237a6359a7e3335890db8da049bdd62fc
2022-12-23 12:19:27 +0000 to 2023-01-04 14:30:01 +0000
- test: revive nightly plugin tests to work (rust-lang/cargo#11534)
- Add note to release notes about rejecting multiple registries. (rust-lang/cargo#11531)
- Fix a typo `fresheness` -> `freshness` (rust-lang/cargo#11529)
- Reasons for rebuilding (rust-lang/cargo#11407)
- Asymmetric tokens (rust-lang/cargo#10771)
- Use proper git URL for GitHub repos (rust-lang/cargo#11517)
- Add `registry.default` example (rust-lang/cargo#11516)
- Support vendoring with different revs from same git repo (rust-lang/cargo#10690)

Also update license exceptions and permitted dependencies
for new cargo dependency "pasetors".

A new dependency `getrandom` is added into `rustc-workspace-hacks`,
since it requires feature `js`.

r? `@ghost`
@ehuss ehuss added this to the 1.68.0 milestone Jan 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Rustin170506 Rustin170506 Rustin170506 approved these changes

@weihanglo weihanglo weihanglo approved these changes

@ehuss ehuss Awaiting requested review from ehuss

Assignees

@ehuss ehuss

Labels
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.68.0
Development

Successfully merging this pull request may close these issues.

vendor doesn't work with dependencies with different revs from same git
7 participants
@AtkinsChang @rust-highfive @bors @Rustin170506 @weihanglo @ehuss @rustbot