Allow publishing from workspace root. #9559

tcmal · 2021-06-09T13:12:33Z

Adds -p, --workspace, and --exclude to package and publish commands.

Uses ephemeral workspaces to avoid changing the existing functions too much.
There might be more Finished dev [unoptimized + debuginfo] target messages when packaging than there should be, I couldn't figure out what was generating them.
The tests aren't super extensive, as all the specs from arguments code should already be tested elsewhere.

Closes #7345

rust-highfive · 2021-06-09T13:12:36Z

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

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

ehuss · 2021-06-09T13:55:25Z

Thanks for the PR! I think for now, there should not be a --workspace flag. There is an issue with uploading multiple packages in quick succession. There is a brief period after a package is uploaded that it is not available in the index, which can cause published crates to fail if they require the new versions. Additionally, when publishing multiple inter-related packages, the publish process will need to start from the leaves of the dependency tree and work its way upward. For now, can this be kept to only one package?

tcmal · 2021-06-19T11:40:40Z

I'm not sure why it's failing, I'm going to rebase and see if that fixes it

EDIT: Nevermind, I see the issue.

src/cargo/ops/cargo_package.rs

src/cargo/ops/registry.rs

alexcrichton · 2021-06-21T15:46:56Z

src/cargo/ops/registry.rs

+    let specs = opts.to_publish.to_package_id_specs(root_ws)?;
+    let mut pkgs = root_ws.members_with_features(&specs, &opts.cli_features)?;
+
+    anyhow::ensure!(pkgs.len() == 1, "can only publish one package at a time.");


Am I correct in reading this in that this will support many -p flags and and --workspace, but we'll just return an error if they get matched? If so, can this error be elaborated a bit as to why multiple packages aren't supported at this time? (perhaps linking to a tracking issue?)

It won't take --workspace, but it will take multiple -p flags. Like @ehuss said this is due to an issue with crates.io, I couldn't find any tracking issue on their repo.

bors · 2021-07-02T14:54:50Z

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

ehuss

Sorry about the long delay.

src/bin/cargo/commands/publish.rs

src/cargo/ops/cargo_package.rs

ehuss · 2021-07-22T13:55:49Z

Thanks!

@bors r+

bors · 2021-07-22T13:55:51Z

📌 Commit ae44e7cd6fb43a30b43080c8292d21c1dee0ff4f has been approved by ehuss

bors · 2021-07-22T13:55:58Z

⌛ Testing commit ae44e7cd6fb43a30b43080c8292d21c1dee0ff4f with merge 0f6642d170827f55f00eff5e537faf59f7b35ebd...

bors · 2021-07-22T14:07:55Z

💔 Test failed - checks-actions

tests/testsuite/publish.rs

adds -p, --workspace, and --exclude to package command, and -p to publish command, as well as tests for both. closes #7345

ehuss · 2021-07-26T19:57:57Z

Thanks! I pushed a small change to remove the unnecessary format!.

@bors r+

bors · 2021-07-26T19:57:58Z

📌 Commit 30ff842 has been approved by ehuss

bors · 2021-07-26T19:58:06Z

⌛ Testing commit 30ff842 with merge 9bc7a37...

bors · 2021-07-26T20:23:18Z

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 9bc7a37 to master...

Update cargo 8 commits in cebef2951ee69617852844894164b54ed478a7da..d21c22870e58499d6c31f1bef3bf1255eb021666 2021-07-22 13:01:52 +0000 to 2021-07-26 20:23:21 +0000 - Fix version string. (rust-lang/cargo#9727) - Allow publishing from workspace root. (rust-lang/cargo#9559) - Better msg for wrong position (rust-lang/cargo#9723) - Stabilize the rustc-link-arg option (rust-lang/cargo#9557) - Warning when using features in replace (rust-lang/cargo#9681) - Refactor if let chains to matches! macro (rust-lang/cargo#9721) - Weather is not nice today.. (rust-lang/cargo#9720) - Update should_use_metadata function (rust-lang/cargo#9653)

Some minor updates for package/publish package selection. This is just a few small things I missed in the review of #9559. * Don't include the deprecated `--all` flag in `cargo package`. * Update the man pages for the new flags.

rust-highfive assigned alexcrichton Jun 9, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 9, 2021

alexcrichton reviewed Jun 21, 2021

View reviewed changes

ehuss reviewed Jul 21, 2021

View reviewed changes

src/bin/cargo/commands/publish.rs Outdated Show resolved Hide resolved

src/cargo/ops/cargo_package.rs Outdated Show resolved Hide resolved

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 Jul 22, 2021

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 22, 2021

ehuss reviewed Jul 22, 2021

View reviewed changes

tests/testsuite/publish.rs Outdated Show resolved Hide resolved

tcmal and others added 2 commits July 26, 2021 16:31

feat(package+publish): package arguments

8f1f0e4

adds -p, --workspace, and --exclude to package command, and -p to publish command, as well as tests for both. closes #7345

Remove unnecessary format!

30ff842

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 Jul 26, 2021

bors merged commit 9bc7a37 into rust-lang:master Jul 26, 2021

ehuss mentioned this pull request Jul 27, 2021

Update cargo rust-lang/rust#87502

Merged

ehuss mentioned this pull request Jul 30, 2021

Some minor updates for package/publish package selection. #9749

Merged

ehuss added this to the 1.56.0 milestone Feb 6, 2022

foresterre mentioned this pull request Feb 7, 2022

Reflect the addition of the -p flag in Cargo 1.56 in chapter 14 rust-lang/book#3051

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow publishing from workspace root. #9559

Allow publishing from workspace root. #9559

tcmal commented Jun 9, 2021

rust-highfive commented Jun 9, 2021

ehuss commented Jun 9, 2021

tcmal commented Jun 19, 2021 •

edited

Loading

alexcrichton Jun 21, 2021

tcmal Jun 27, 2021

bors commented Jul 2, 2021

ehuss left a comment

ehuss commented Jul 22, 2021

bors commented Jul 22, 2021

bors commented Jul 22, 2021

bors commented Jul 22, 2021

ehuss commented Jul 26, 2021

bors commented Jul 26, 2021

bors commented Jul 26, 2021

bors commented Jul 26, 2021

Allow publishing from workspace root. #9559

Allow publishing from workspace root. #9559

Conversation

tcmal commented Jun 9, 2021

rust-highfive commented Jun 9, 2021

ehuss commented Jun 9, 2021

tcmal commented Jun 19, 2021 • edited Loading

alexcrichton Jun 21, 2021

Choose a reason for hiding this comment

tcmal Jun 27, 2021

Choose a reason for hiding this comment

bors commented Jul 2, 2021

ehuss left a comment

Choose a reason for hiding this comment

ehuss commented Jul 22, 2021

bors commented Jul 22, 2021

bors commented Jul 22, 2021

bors commented Jul 22, 2021

ehuss commented Jul 26, 2021

bors commented Jul 26, 2021

bors commented Jul 26, 2021

bors commented Jul 26, 2021

tcmal commented Jun 19, 2021 •

edited

Loading