Skip to content

Commit

Permalink
Merge branch 'main' into dataset_typed_uuid
Browse files Browse the repository at this point in the history
  • Loading branch information
jmpesp committed Nov 18, 2024
2 parents df03ce8 + 118aa01 commit 27527e8
Show file tree
Hide file tree
Showing 130 changed files with 7,476 additions and 1,798 deletions.
9 changes: 8 additions & 1 deletion .config/nextest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ fail-fast = false
# invocations of nextest happen.
command = 'cargo run -p crdb-seed --profile test'

[[profile.default.scripts]]
filter = 'package(omicron-clickhouse-admin)'
setup = 'clickhouse-cluster'

[script.clickhouse-cluster]
command = 'cargo run -p clickhouse-cluster-dev'

[test-groups]
# The ClickHouse cluster tests currently rely on a hard-coded set of ports for
# the nodes in the cluster. We would like to relax this in the future, at which
Expand All @@ -39,7 +46,7 @@ live-tests = { max-threads = 1 }
default-filter = 'all() - package(omicron-live-tests) - package(end-to-end-tests)'

[[profile.default.overrides]]
filter = 'package(oximeter-db) and test(replicated)'
filter = 'package(oximeter-db) and test(replicated) + package(omicron-clickhouse-admin)'
test-group = 'clickhouse-cluster'

[[profile.default.overrides]]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hakari.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
toolchain: stable
- name: Install cargo-hakari
uses: taiki-e/install-action@9c04113bd63f9659d7a53908386758275ab35630 # v2
uses: taiki-e/install-action@5d427d86f088a6cedcddb92b3ad038d30721b52f # v2
with:
tool: cargo-hakari
- name: Check workspace-hack Cargo.toml is up-to-date
Expand Down
Loading

0 comments on commit 27527e8

Please sign in to comment.