Skip to content

Commit

Permalink
Merge branch 'main' into add-precondition-to-configuration-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
internet-diglett committed Jan 10, 2025
2 parents 57d0efc + d9a6a8b commit 7c02d9e
Show file tree
Hide file tree
Showing 236 changed files with 22,600 additions and 8,864 deletions.
2 changes: 1 addition & 1 deletion .config/nextest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# The required version should be bumped up if we need new features, performance
# improvements or bugfixes that are present in newer versions of nextest.
nextest-version = { required = "0.9.77", recommended = "0.9.78" }
nextest-version = { required = "0.9.77", recommended = "0.9.86" }

experimental = ["setup-scripts"]

Expand Down
5 changes: 3 additions & 2 deletions .github/buildomat/build-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ target_os=$1
# NOTE: This version should be in sync with the recommended version in
# .config/nextest.toml. (Maybe build an automated way to pull the recommended
# version in the future.)
NEXTEST_VERSION='0.9.78'
NEXTEST_VERSION='0.9.86'

cargo --version
rustc --version
Expand Down Expand Up @@ -69,7 +69,8 @@ banner ls-apis
source ./tools/include/force-git-over-https.sh;
ptime -m cargo xtask ls-apis apis &&
ptime -m cargo xtask ls-apis deployment-units &&
ptime -m cargo xtask ls-apis servers
ptime -m cargo xtask ls-apis servers &&
ptime -m cargo xtask ls-apis check
)

#
Expand Down
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
Loading

0 comments on commit 7c02d9e

Please sign in to comment.