Skip to content

Commit

Permalink
[3/n] [omicron-package] update omicron-zone-package (#7296)
Browse files Browse the repository at this point in the history
This pulls in some API changes, particularly around newtypes for package
and service names.
  • Loading branch information
sunshowers authored Jan 7, 2025
1 parent 94d76b8 commit 12b65a3
Show file tree
Hide file tree
Showing 11 changed files with 116 additions and 125 deletions.
69 changes: 24 additions & 45 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ omicron-rpaths = { path = "rpaths" }
omicron-sled-agent = { path = "sled-agent" }
omicron-test-utils = { path = "test-utils" }
omicron-workspace-hack = "0.1.0"
omicron-zone-package = "0.11.1"
omicron-zone-package = "0.12.0"
oxide-client = { path = "clients/oxide-client" }
oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "b56afeeb14e0042cbd7bda85b166ed86ee17820e", features = [ "api", "std" ] }
oxlog = { path = "dev-tools/oxlog" }
Expand Down
6 changes: 5 additions & 1 deletion clients/dpd-client/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@ use anyhow::bail;
use anyhow::Context;
use anyhow::Result;
use omicron_zone_package::config::Config;
use omicron_zone_package::config::PackageName;
use omicron_zone_package::package::PackageSource;
use quote::quote;
use std::env;
use std::fs;
use std::path::Path;

const DENDRITE_ASIC_PACKAGE: PackageName =
PackageName::new_const("dendrite-asic");

fn main() -> Result<()> {
// Find the current dendrite repo commit from our package manifest.
let manifest = fs::read_to_string("../../package-manifest.toml")
Expand All @@ -31,7 +35,7 @@ fn main() -> Result<()> {

let dendrite = config
.packages
.get("dendrite-asic")
.get(&DENDRITE_ASIC_PACKAGE)
.context("missing dendrite package in ../../package-manifest.toml")?;

let local_path = match &dendrite.source {
Expand Down
Loading

0 comments on commit 12b65a3

Please sign in to comment.