Skip to content

Commit

Permalink
Merge branch 'main' into john/blueprint-nexus-allocate-networking
Browse files Browse the repository at this point in the history
  • Loading branch information
jgallagher committed Feb 20, 2024
2 parents d2a49da + 915276d commit cfffe14
Show file tree
Hide file tree
Showing 52 changed files with 1,873 additions and 400 deletions.
11 changes: 10 additions & 1 deletion .config/hakari.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,13 @@ platforms = [
exact-versions = true

[traversal-excludes]
workspace-members = ["xtask"]
workspace-members = [
# Exclude xtask because it needs to be built quickly.
"xtask",

# Exclude omicron-uuid-kinds because it is a no-std crate. Depending on the
# workspace-hack isn't too problematic because other projects pulling in
# omicron as a git dependency will only see an empty workspace-hack. But
# let's make this explicit.
"omicron-uuid-kinds",
]
2 changes: 1 addition & 1 deletion .github/workflows/hakari.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
toolchain: stable
- name: Install cargo-hakari
uses: taiki-e/install-action@14422f84f07a2d547893af56258f5e59333262df # v2
uses: taiki-e/install-action@6943331e01261cdff7420bbc2508cb463574e404 # v2
with:
tool: cargo-hakari
- name: Check workspace-hack Cargo.toml is up-to-date
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate-openapi-spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
ref: ${{ github.event.pull_request.head.sha }} # see omicron#4461
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: '18'
- name: Install our tools
Expand Down
Loading

0 comments on commit cfffe14

Please sign in to comment.