Skip to content

Commit d63a53f

Browse files
committed
Merge branch 'main' into volume_typed_uuid
2 parents 08e5d68 + 9093ac6 commit d63a53f

File tree

377 files changed

+26639
-8344
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

377 files changed

+26639
-8344
lines changed

.github/buildomat/jobs/package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ptime -m cargo xtask download softnpu
2828
# Build the test target
2929
export CARGO_INCREMENTAL=0
3030
ptime -m cargo run --locked --release --bin omicron-package -- \
31-
-t test target create -i standard -m non-gimlet -s softnpu -r single-sled
31+
-t test target create -p dev
3232
ptime -m cargo run --locked --release --bin omicron-package -- \
3333
-t test package
3434
mapfile -t packages \

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Install Pre-Requisites
5454
run: ./tools/install_builder_prerequisites.sh -y
5555
- name: Set default target
56-
run: cargo run --bin omicron-package -- -t default target create -r single-sled
56+
run: cargo run --bin omicron-package -- -t default target create --preset dev
5757
- name: Check build of deployed Omicron packages
5858
run: cargo run --bin omicron-package -- -t default check
5959

0 commit comments

Comments
 (0)