feat: Add workspace_cargo_toml attribute #3060
Conversation
| let entry = | ||
| entry.context("Failed to walk filesystem finding workspace Cargo.toml files")?; | ||
| let Ok(entry) = entry else { | ||
| // Skip errors. |
There was a problem hiding this comment.
This is a surprise - what kind of errors are you running into?
| .and_then(|path| manifests.get_key_value(path)) | ||
| .and_then(|(path, manifest)| manifest.workspace.as_ref().map(|_| (path, manifest))) | ||
| { | ||
| return Ok(Self::Workspace { |
There was a problem hiding this comment.
This currently skips the "identify any member Cargo.toml files which aren't listed in the manifests" step, which is important for correctness, otherwise we may give false cache hits when those files change. Can we add in that pass (perhaps by giving discover_workspaces a "replace" arg, where we can pass in the workspaces to ignore and replace them with this one instead?
| @@ -337,6 +338,9 @@ CARGO_BAZEL_REPIN=1 CARGO_BAZEL_REPIN_ONLY=crate_index bazel sync --only=crate_i | |||
| doc = "A set of all platform triples to consider when generating dependencies.", | |||
| default = SUPPORTED_PLATFORM_TRIPLES, | |||
| ), | |||
| "workspace_cargo_toml": attr.label( | |||
| doc = "The path to the workspace `Cargo.toml` file.", | |||
There was a problem hiding this comment.
Can you document the default behaviour if this is not specified?
| @@ -462,6 +470,10 @@ CRATES_VENDOR_ATTRS = { | |||
| doc = "The path to a directory to write files into. Absolute paths will be treated as relative to the workspace root", | |||
| default = "crates", | |||
| ), | |||
| "workspace_cargo_toml": attr.label( | |||
| doc = "The path to the workspace's `Cargo.toml` file", | |||
There was a problem hiding this comment.
Can you document the default behaviour if this is not specified?
| @@ -60,6 +60,10 @@ pub struct SpliceOptions { | |||
|
|
|||
| #[clap(long)] | |||
| pub nonhermetic_root_bazel_workspace_dir: PathBuf, | |||
|
|
|||
| // The path to the workspace cargo toml file | |||
There was a problem hiding this comment.
Can you document the default behaviour if this is not specified?
| @@ -82,6 +82,10 @@ pub struct VendorOptions { | |||
| /// You basically never want to use this value. | |||
| #[clap(long)] | |||
| pub nonhermetic_root_bazel_workspace_dir: Utf8PathBuf, | |||
|
|
|||
| /// The path to the workspace cargo toml file | |||
There was a problem hiding this comment.
Can you document the default behaviour if this is not specified?
This PR adds a new workspace toml parameter to allow picking one cargo workspace file when there are multiple in the base repo.
#3059