Use workspace lockfile when running cargo package and cargo publish#11477
Merged
bors merged 4 commits intorust-lang:masterfrom Dec 19, 2022
Merged
Use workspace lockfile when running cargo package and cargo publish#11477bors merged 4 commits intorust-lang:masterfrom
cargo package and cargo publish#11477bors merged 4 commits intorust-lang:masterfrom
Conversation
Collaborator
|
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. |
01mf02
reviewed
Dec 18, 2022
tests/testsuite/publish_lockfile.rs
Outdated
| .file("bar/src/main.rs", "fn main() {}") | ||
| .build(); | ||
| p.cargo("generate-lockfile").run(); | ||
| p.cargo("update -p serde:0.2.1 --precise 0.2.0").run(); |
There was a problem hiding this comment.
Is it possible to move Package::new("serde", "0.2.1").publish(); to this line (and to replace it)?
Contributor
Author
There was a problem hiding this comment.
Sure! Yeah, that makes it clearer what the test is doing.
weihanglo
reviewed
Dec 19, 2022
Member
weihanglo
left a comment
There was a problem hiding this comment.
Looks good to me. Thank you!
Could we do it in two commits? That is,the first commit contains the test passed with the "wrong" behaviour. The second commit contains the actual fix and the correct with_stderr output.
weihanglo
approved these changes
Dec 19, 2022
Member
weihanglo
left a comment
There was a problem hiding this comment.
Oh you already did that, sorry I missed it 🤪
Member
|
Thanks again! @bors r+ |
Contributor
Contributor
Contributor
Author
Contributor
|
☀️ Test successful - checks-actions |
bors
pushed a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 23, 2022
7 commits in c994a4a638370bc7e0ffcbb0e2865afdfa7d4415..2381cbdb4e9b07090f552d34a44a529b6e620e44 2022-12-18 21:50:58 +0000 to 2022-12-23 12:19:27 +0000 - fix: deduplicate dependencies by artifact target (rust-lang/cargo#11478) - Add warning if potentially-scrapable examples are skipped due to dev-dependencies (rust-lang/cargo#11503) - Don't scrape examples from library targets by default (rust-lang/cargo#11499) - Stabilize terminal-width (rust-lang/cargo#11494) - Make sure that hash of `SourceId` is stable (rust-lang/cargo#11501) - Use workspace lockfile when running `cargo package` and `cargo publish` (rust-lang/cargo#11477) - Show `--help` if there is no man page for subcommand (rust-lang/cargo#11473)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 23, 2022
Update cargo 7 commits in c994a4a638370bc7e0ffcbb0e2865afdfa7d4415..2381cbdb4e9b07090f552d34a44a529b6e620e44 2022-12-18 21:50:58 +0000 to 2022-12-23 12:19:27 +0000 - fix: deduplicate dependencies by artifact target (rust-lang/cargo#11478) - Add warning if potentially-scrapable examples are skipped due to dev-dependencies (rust-lang/cargo#11503) - Don't scrape examples from library targets by default (rust-lang/cargo#11499) - Stabilize terminal-width (rust-lang/cargo#11494) - Make sure that hash of `SourceId` is stable (rust-lang/cargo#11501) - Use workspace lockfile when running `cargo package` and `cargo publish` (rust-lang/cargo#11477) - Show `--help` if there is no man page for subcommand (rust-lang/cargo#11473) r? `@ghost`
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR try to resolve?
Fix #11148.
How should we test and review this PR?
Please run the integration test in
tests/testsuite/publish_lockfile.rsor try the steps from the issue.