Skip to content

Commit

Permalink
Remove zenoh-shm dev dependency on zenoh-shm test (#1177)
Browse files Browse the repository at this point in the history
* Remove `zenoh-shm` dev dependency on `zenoh-shm test`

* Enable `test` feature in CI
  • Loading branch information
fuzzypixelz authored Jun 20, 2024
1 parent e478df6 commit 6ce0aad
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ jobs:
run: cargo +stable clippy -p zenoh --all-targets --features unstable,shared-memory -- --deny warnings

- name: Clippy workspace
run: cargo +stable clippy --all-targets -- --deny warnings
run: cargo +stable clippy --all-targets --features test -- --deny warnings

- name: Clippy workspace unstable
run: cargo +stable clippy --all-targets --features unstable -- --deny warnings
run: cargo +stable clippy --all-targets --features unstable,test -- --deny warnings

- name: Clippy all features
if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest' }}
Expand Down Expand Up @@ -118,15 +118,15 @@ jobs:
uses: taiki-e/install-action@nextest

- name: Run tests
run: cargo nextest run --exclude zenoh-examples --exclude zenoh-plugin-example --workspace
run: cargo nextest run -F test --exclude zenoh-examples --exclude zenoh-plugin-example --workspace

- name: Run tests with SHM
if: ${{ matrix.os == 'macOS-latest' || matrix.os == 'windows-latest' }}
run: cargo nextest run -F shared-memory -F unstable -E 'not (test(test_default_features))' --exclude zenoh-examples --exclude zenoh-plugin-example --workspace
run: cargo nextest run -F test -F shared-memory -F unstable -E 'not (test(test_default_features))' --exclude zenoh-examples --exclude zenoh-plugin-example --workspace

- name: Run tests with SHM + unixpipe
if: ${{ matrix.os == 'ubuntu-latest' }}
run: cargo nextest run -F shared-memory -F unstable -F transport_unixpipe -E 'not (test(test_default_features))' --exclude zenoh-examples --exclude zenoh-plugin-example --workspace
run: cargo nextest run -F test -F shared-memory -F unstable -F transport_unixpipe -E 'not (test(test_default_features))' --exclude zenoh-examples --exclude zenoh-plugin-example --workspace

- name: Check for feature leaks
if: ${{ matrix.os == 'ubuntu-latest' }}
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
name: Typos Check
runs-on: ubuntu-latest
steps:
- name: Clone this repository
- name: Clone this repository
uses: actions/checkout@v4

- name: Check spelling
Expand Down
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions commons/zenoh-shm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ test = ["num_cpus"]
async-trait = { workspace = true }
bincode = { workspace = true }
crc = { workspace = true }
tracing = {workspace = true}
tracing = { workspace = true }
serde = { workspace = true, features = ["default"] }
shared_memory = { workspace = true }
tokio = { workspace = true }
Expand All @@ -52,5 +52,4 @@ lockfree = { workspace = true }
stabby = { workspace = true }

[dev-dependencies]
zenoh-shm = { workspace = true, features = ["test"] }
libc = { workspace = true }

0 comments on commit 6ce0aad

Please sign in to comment.