Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4/n] [omicron-package] add and use target presets #7288

Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ptime -m cargo xtask download softnpu
# Build the test target
export CARGO_INCREMENTAL=0
ptime -m cargo run --locked --release --bin omicron-package -- \
-t test target create -i standard -m non-gimlet -s softnpu -r single-sled
-t test target create -p dev
ptime -m cargo run --locked --release --bin omicron-package -- \
-t test package
mapfile -t packages \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Install Pre-Requisites
run: ./tools/install_builder_prerequisites.sh -y
- name: Set default target
run: cargo run --bin omicron-package -- -t default target create -r single-sled
run: cargo run --bin omicron-package -- -t default target create --preset dev
- name: Check build of deployed Omicron packages
run: cargo run --bin omicron-package -- -t default check

Expand Down
70 changes: 25 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 @@ -498,7 +498,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
Loading