Skip to content

Commit

Permalink
Merge branch 'simplify-asyncbb8-errors' into retry-txn
Browse files Browse the repository at this point in the history
  • Loading branch information
smklein committed Dec 2, 2023
2 parents d226ab0 + 48363a1 commit 0480e68
Show file tree
Hide file tree
Showing 110 changed files with 2,500 additions and 544 deletions.
4 changes: 3 additions & 1 deletion .config/nextest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ nextest-version = { required = "0.9.59", recommended = "0.9.59" }
experimental = ["setup-scripts"]

[[profile.default.scripts]]
filter = 'rdeps(nexus-test-utils)'
# Exclude omicron-dev tests from crdb-seed as we explicitly want to simulate an
# environment where the seed file doesn't exist.
filter = 'rdeps(nexus-test-utils) - package(omicron-dev)'
setup = 'crdb-seed'

[profile.ci]
Expand Down
1 change: 1 addition & 0 deletions .github/buildomat/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ org_only = true
allow_users = [
"dependabot[bot]",
"oxide-reflector-bot[bot]",
"oxide-renovate[bot]",
"renovate[bot]",
]
9 changes: 9 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"local>oxidecomputer/renovate-config",
"local>oxidecomputer/renovate-config//rust/autocreate",
"local>oxidecomputer/renovate-config:post-upgrade",
"helpers:pinGitHubActionDigests"
]
}
2 changes: 1 addition & 1 deletion .github/workflows/check-opte-ver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
check-opte-ver:
runs-on: ubuntu-22.04
steps:
- uses: actions/[email protected]
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- name: Install jq
run: sudo apt-get install -y jq
- name: Install toml-cli
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-workspace-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ jobs:
check-workspace-deps:
runs-on: ubuntu-22.04
steps:
- uses: actions/[email protected]
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- name: Check Workspace Dependencies
run: cargo xtask check-workspace-deps
10 changes: 5 additions & 5 deletions .github/workflows/hakari.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ jobs:
env:
RUSTFLAGS: -D warnings
steps:
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
with:
toolchain: stable
- name: Install cargo-hakari
uses: taiki-e/install-action@v2
uses: taiki-e/install-action@e659bf85ee986e37e35cc1c53bfeebe044d8133e # v2
with:
tool: cargo-hakari
- name: Check workspace-hack Cargo.toml is up-to-date
uses: actions-rs/cargo@v1
uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
with:
command: hakari
args: generate --diff
- name: Check all crates depend on workspace-hack
uses: actions-rs/cargo@v1
uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
with:
command: hakari
args: manage-deps --dry-run
14 changes: 7 additions & 7 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
check-style:
runs-on: ubuntu-22.04
steps:
- uses: actions/[email protected]
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- name: Report cargo version
run: cargo --version
- name: Report rustfmt version
Expand All @@ -27,8 +27,8 @@ jobs:
# This repo is unstable and unnecessary: https://github.com/microsoft/linux-package-repositories/issues/34
- name: Disable packages.microsoft.com repo
run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
- uses: actions/[email protected]
- uses: Swatinem/[email protected]
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # v2.2.1
if: ${{ github.ref != 'refs/heads/main' }}
- name: Report cargo version
run: cargo --version
Expand All @@ -53,8 +53,8 @@ jobs:
# This repo is unstable and unnecessary: https://github.com/microsoft/linux-package-repositories/issues/34
- name: Disable packages.microsoft.com repo
run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
- uses: actions/[email protected]
- uses: Swatinem/[email protected]
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # v2.2.1
if: ${{ github.ref != 'refs/heads/main' }}
- name: Report cargo version
run: cargo --version
Expand All @@ -79,8 +79,8 @@ jobs:
# This repo is unstable and unnecessary: https://github.com/microsoft/linux-package-repositories/issues/34
- name: Disable packages.microsoft.com repo
run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
- uses: actions/[email protected]
- uses: Swatinem/[email protected]
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # v2.2.1
if: ${{ github.ref != 'refs/heads/main' }}
- name: Report cargo version
run: cargo --version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-dendrite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:

# Checkout both the target and integration branches
- uses: actions/[email protected]
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
with:
token: ${{ inputs.reflector_access_token }}
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-maghemite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:

# Checkout both the target and integration branches
- uses: actions/[email protected]
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
with:
token: ${{ inputs.reflector_access_token }}
fetch-depth: 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate-openapi-spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
format:
runs-on: ubuntu-22.04
steps:
- uses: actions/[email protected]
- uses: actions/[email protected]
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
with:
node-version: '18'
- name: Install our tools
Expand Down
Loading

0 comments on commit 0480e68

Please sign in to comment.