Skip to content

Commit

Permalink
Merge branch 'main' into issue-5214-v2p-mapping-rpw
Browse files Browse the repository at this point in the history
  • Loading branch information
internet-diglett committed May 21, 2024
2 parents 5e5168e + ebcc2ac commit 228bd54
Show file tree
Hide file tree
Showing 33 changed files with 1,381 additions and 898 deletions.
27 changes: 27 additions & 0 deletions .github/buildomat/jobs/omicron-common.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/bash
#:
#: name = "omicron-common (helios)"
#: variety = "basic"
#: target = "helios-2.0"
#: rust_toolchain = "1.77.2"
#: output_rules = []
#: skip_clone = true

# Verify that omicron-common builds successfully when used as a dependency
# in an external project. It must not leak anything that requires an external
# dependency (apart from OpenSSL/pkg-config).

set -o errexit
set -o pipefail
set -o xtrace

cargo --version
rustc --version

cargo new --lib test-project
cd test-project
cargo add omicron-common \
--git https://github.com/oxidecomputer/omicron.git \
--rev "$GITHUB_SHA"
cargo check
cargo build --release
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/tuf-repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ esac
pfexec zfs create -p "rpool/images/$USER/host"
pfexec zfs create -p "rpool/images/$USER/recovery"

cargo run --release --bin omicron-releng -- --output-dir /work
cargo xtask releng --output-dir /work
4 changes: 2 additions & 2 deletions .github/workflows/hakari.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
env:
RUSTFLAGS: -D warnings
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
with:
ref: ${{ github.event.pull_request.head.sha }} # see omicron#4461
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
with:
toolchain: stable
- name: Install cargo-hakari
uses: taiki-e/install-action@2f990e9c484f0590cb76a07296e9677b417493e9 # v2
uses: taiki-e/install-action@0fc560009ad92371154ca652dcf2620d19331eee # v2
with:
tool: cargo-hakari
- name: Check workspace-hack Cargo.toml is up-to-date
Expand Down
Loading

0 comments on commit 228bd54

Please sign in to comment.