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

docs: More information on what is and isn't included by cargo package #14684

Merged
merged 4 commits into from
Oct 15, 2024

Conversation

sourcefrog
Copy link
Contributor

What does this PR try to resolve?

Add more detail to cargo package explaining what is and isn't included.

This doesn't add the feature requested by #11203 (shipping symlinks) but it does at least make it more clear that it's not supported.

How should we test and review this PR?

Docs only change.

I wrote this by reading src/cargo/sources/path.rs, in addition to my observations of cargo behavior, so it might be helpful for reviewers to check the new docs against the code.

@rustbot
Copy link
Collaborator

rustbot commented Oct 14, 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 rustbot added A-documenting-cargo-itself Area: Cargo's documentation S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 14, 2024
@sourcefrog
Copy link
Contributor Author

r? @weihanglo

@rustbot rustbot assigned weihanglo and unassigned ehuss Oct 14, 2024
@rustbot rustbot added the A-cli-help Area: built-in command-line help label Oct 14, 2024
@sourcefrog
Copy link
Contributor Author

The failures seem to be unrelated flakes?

@weihanglo
Copy link
Member

weihanglo commented Oct 14, 2024

Perhaps we need to purchase some credits from Docker? 😬

ERROR: failed to solve: httpd:2.4-alpine: failed to resolve source metadata for docker.io/library/httpd:2.4-alpine: failed to copy: httpReadSeeker: failed open: unexpected status code https://registry-1.docker.io/v2/library/httpd/manifests/sha256:66c49302c02430619abb84240a438bcfc083015661009fcaaeaac931450f62cd: 429 Too Many Requests - Server message: toomanyrequests: You have reached your pull rate limit. You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit

Or we could switch to other image registry services

@sourcefrog
Copy link
Contributor Author

https://github.com/rust-lang/cargo/actions/runs/11330170805/job/31507413375?pr=14684

Perhaps this is getting rate-limited based on the GitHub workers IP pool, if the cargo build does not currently pass any credentials? If so, just switching to an authenticated pull, even without paying, might help.

It also might be possible to cache the image in GitHub Actions, per https://docs.docker.com/build/ci/github-actions/cache/. That would help stay below the limit of authenticated pulls. Even if we're using just the GitHub IPs it would probably reduce the error rate.

We could split out a separate issue? I can have a look if you like, although as I'm not a project member I might need help with registering an account or uploading secrets.

@weihanglo
Copy link
Member

We could split out a separate issue? I can have a look if you like, although as I'm not a project member I might need help with registering an account or uploading secrets.

Blocked on #14686.

sourcefrog and others added 2 commits October 15, 2024 07:57
Co-authored-by: Weihang Lo <weihanglo@users.noreply.github.com>
@weihanglo
Copy link
Member

Thank you!

@bors r+

@bors
Copy link
Contributor

bors commented Oct 15, 2024

📌 Commit b8125da 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 Oct 15, 2024
@bors
Copy link
Contributor

bors commented Oct 15, 2024

⌛ Testing commit b8125da with merge 8c30ce5...

@bors
Copy link
Contributor

bors commented Oct 15, 2024

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 8c30ce5 to master...

@bors bors merged commit 8c30ce5 into rust-lang:master Oct 15, 2024
22 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 15, 2024
Update cargo

14 commits in 15fbd2f607d4defc87053b8b76bf5038f2483cf4..8c30ce53688e25f7e9d860b33cc914fb2957ca9a
2024-10-08 21:08:11 +0000 to 2024-10-15 16:43:16 +0000
- docs: More information on what is and isn't included by cargo package (rust-lang/cargo#14684)
- fix(resolver): share conflict cache between activation retries (rust-lang/cargo#14692)
- fix(git): dont fetch tags by default (rust-lang/cargo#14688)
- Support package selection options like `--exclude` in `cargo publish` (rust-lang/cargo#14659)
- docs: install options -&gt; uninstall options (rust-lang/cargo#14682)
- docs: tools should only interpret a line starting with `{` as JSON (rust-lang/cargo#14677)
- cargo test --help: clarify --tests and --benches (rust-lang/cargo#14675)
- docs(env): minor improvements in environment variables doc (rust-lang/cargo#14676)
- docs: document official external commands (rust-lang/cargo#14669)
- Fix panic when running cargo tree on a package with a cross compiled bindep (rust-lang/cargo#14593)
- Remove the support for `Cargo.toml` of the cargo-script (rust-lang/cargo#14670)
- docs(resolver): Lay groundwork for documenting MSRV-aware logic (rust-lang/cargo#14662)
- chore(deps): update rust crate pulldown-cmark to 0.12.0 (rust-lang/cargo#14668)
- Improve resolver speed (rust-lang/cargo#14663)
@rustbot rustbot added this to the 1.84.0 milestone Oct 16, 2024
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Oct 17, 2024
Update cargo

14 commits in 15fbd2f607d4defc87053b8b76bf5038f2483cf4..8c30ce53688e25f7e9d860b33cc914fb2957ca9a
2024-10-08 21:08:11 +0000 to 2024-10-15 16:43:16 +0000
- docs: More information on what is and isn't included by cargo package (rust-lang/cargo#14684)
- fix(resolver): share conflict cache between activation retries (rust-lang/cargo#14692)
- fix(git): dont fetch tags by default (rust-lang/cargo#14688)
- Support package selection options like `--exclude` in `cargo publish` (rust-lang/cargo#14659)
- docs: install options -&gt; uninstall options (rust-lang/cargo#14682)
- docs: tools should only interpret a line starting with `{` as JSON (rust-lang/cargo#14677)
- cargo test --help: clarify --tests and --benches (rust-lang/cargo#14675)
- docs(env): minor improvements in environment variables doc (rust-lang/cargo#14676)
- docs: document official external commands (rust-lang/cargo#14669)
- Fix panic when running cargo tree on a package with a cross compiled bindep (rust-lang/cargo#14593)
- Remove the support for `Cargo.toml` of the cargo-script (rust-lang/cargo#14670)
- docs(resolver): Lay groundwork for documenting MSRV-aware logic (rust-lang/cargo#14662)
- chore(deps): update rust crate pulldown-cmark to 0.12.0 (rust-lang/cargo#14668)
- Improve resolver speed (rust-lang/cargo#14663)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-cli-help Area: built-in command-line help A-documenting-cargo-itself Area: Cargo's documentation 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.

5 participants