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

Add home crate to cargo crates #11359

Merged
merged 101 commits into from
Dec 14, 2022
Merged

Conversation

LucioFranco
Copy link
Member

What does this PR try to resolve?

The home crate is the crate used by both rustup and cargo to define their home directories. The crate is quite small but plays an important role in gluing rust tooling together. This PR adds this crate the crates folder within cargo to allow the cargo team and the rust project to maintain this small crate.

Additional information

I've also added both rust-lang-owners and ehuss as owners of the crate. Once, merged I will archive the old repo.

Reference zulip conversation: https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/Moving.20the.20home.20crate.20into.20rust-lang.20and.20under.20cargo/near/299975263

cc @weihanglo @ehuss

@LucioFranco
Copy link
Member Author

@ehuss I think I've addressed all your concerns and this should be ready to go (pending CI)! Let me know if there is anything else you would like to see changed.

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. Thanks!

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.

Thanks for looking into how to bring in the history!

.github/workflows/main.yml Outdated Show resolved Hide resolved
@ehuss
Copy link
Contributor

ehuss commented Dec 13, 2022

Thanks!

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 13, 2022

📌 Commit 18a06cc has been approved by ehuss

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 13, 2022
@weihanglo
Copy link
Member

stuck?

@bors retry

@ehuss
Copy link
Contributor

ehuss commented Dec 13, 2022

Oh sorry, I should have commented somewhere. There was a GitHub outage this morning, and bors is now stuck. We have to wait for infra to fix it (or for bors to fix itself).

@weihanglo

This comment was marked as duplicate.

@bors

This comment was marked as duplicate.

@weihanglo

This comment was marked as duplicate.

@weihanglo
Copy link
Member

Still not fixed? I saw some PR in rust-lang/rust started to run.

@bors r-
@bors r=ehuss

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 14, 2022
@bors
Copy link
Collaborator

bors commented Dec 14, 2022

📌 Commit 18a06cc has been approved by ehuss

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-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. labels Dec 14, 2022
@bors
Copy link
Collaborator

bors commented Dec 14, 2022

⌛ Testing commit 18a06cc with merge 06178d7...

@bors
Copy link
Collaborator

bors commented Dec 14, 2022

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 06178d7 to master...

@bors bors merged commit 06178d7 into rust-lang:master Dec 14, 2022
weihanglo added a commit to weihanglo/rust that referenced this pull request Dec 14, 2022
8 commits in 70898e522116f6c23971e2a554b2dc85fd4c84cd..cc0a320879c17207bbfb96b5d778e28a2c62030d
2022-12-05 19:43:44 +0000 to 2022-12-14 14:46:57 +0000
- artifact deps should works when target field specified coexists with `optional = true` (rust-lang/cargo#11434)
- Add `home` crate to cargo crates (rust-lang/cargo#11359)
- Use proper git URL for GitHub repos (rust-lang/cargo#11475)
- Fixes flock(fd, LOCK_UN) emulation on Solaris. (rust-lang/cargo#11474)
- Allow Check targets needed for optional doc-scraping to fail without killing the build (rust-lang/cargo#11450)
- fix: gleaning rustdocflags from `target.cfg(…)` is not supported (rust-lang/cargo#11323)
- Fix typo (rust-lang/cargo#11470)
- resolver.md: Fix naming in example (rust-lang/cargo#11469)
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 14, 2022
Update cargo

8 commits in 70898e522116f6c23971e2a554b2dc85fd4c84cd..cc0a320879c17207bbfb96b5d778e28a2c62030d 2022-12-05 19:43:44 +0000 to 2022-12-14 14:46:57 +0000
- artifact deps should works when target field specified coexists with `optional = true` (rust-lang/cargo#11434)
- Add `home` crate to cargo crates (rust-lang/cargo#11359)
- Use proper git URL for GitHub repos (rust-lang/cargo#11475)
- Fixes flock(fd, LOCK_UN) emulation on Solaris. (rust-lang/cargo#11474)
- Allow Check targets needed for optional doc-scraping to fail without killing the build (rust-lang/cargo#11450)
- fix: gleaning rustdocflags from `target.cfg(…)` is not supported (rust-lang/cargo#11323)
- Fix typo (rust-lang/cargo#11470)
- resolver.md: Fix naming in example (rust-lang/cargo#11469)

r? `@ghost`
@ehuss ehuss added this to the 1.68.0 milestone Dec 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

None yet