Skip to content

Commit

Permalink
omicron-package: allow building specific packages and their dependenc…
Browse files Browse the repository at this point in the history
…ies (#5799)
  • Loading branch information
iliana authored Jun 24, 2024
1 parent 070391e commit 895f280
Show file tree
Hide file tree
Showing 7 changed files with 204 additions and 90 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions dev-tools/xtask/src/check_workspace_deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,23 @@ pub fn run_cmd() -> Result<()> {
}
}

let mut seen_bins = BTreeSet::new();
for package in &workspace.packages {
if workspace.workspace_members.contains(&package.id) {
for target in &package.targets {
if target.is_bin() {
if !seen_bins.insert(&target.name) {
eprintln!(
"error: bin target {:?} seen multiple times",
target.name
);
nerrors += 1;
}
}
}
}
}

eprintln!(
"check-workspace-deps: errors: {}, warnings: {}",
nerrors, nwarnings
Expand Down
2 changes: 0 additions & 2 deletions installinator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,3 @@ tokio-stream.workspace = true

[features]
image-standard = []
image-trampoline = []
rack-topology-single-sled = []
4 changes: 2 additions & 2 deletions package/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ workspace = true
[dependencies]
anyhow.workspace = true
camino.workspace = true
cargo_metadata.workspace = true
clap.workspace = true
futures.workspace = true
hex.workspace = true
illumos-utils.workspace = true
indicatif.workspace = true
omicron-workspace-hack.workspace = true
omicron-zone-package.workspace = true
petgraph.workspace = true
rayon.workspace = true
Expand All @@ -30,13 +32,11 @@ slog-bunyan.workspace = true
slog-term.workspace = true
smf.workspace = true
strum.workspace = true
swrite.workspace = true
tar.workspace = true
thiserror.workspace = true
tokio = { workspace = true, features = [ "full" ] }
toml.workspace = true
walkdir.workspace = true
omicron-workspace-hack.workspace = true

[dev-dependencies]
expectorate.workspace = true
Expand Down
Loading

0 comments on commit 895f280

Please sign in to comment.