Skip to content

Commit

Permalink
feat: bump zenoh version (#485)
Browse files Browse the repository at this point in the history
* chore: rebase onto dev/1.0.0

* fix: fix clippy lint

* fix: comment entity_global_id...

* fix: fix comment

* fix: comment eid in the test

* fix: fix test

* fix: fix test

* fix: fix test

* fix: add comment
  • Loading branch information
wyfo authored Jul 5, 2024
1 parent a0557ba commit f3af49c
Show file tree
Hide file tree
Showing 48 changed files with 940 additions and 789 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
run: cargo clippy --all-targets --all-features -- --deny warnings

- name: Run rustfmt
run: cargo fmt --check
run: cargo fmt --check -- --config "unstable_features=true,imports_granularity=Crate,group_imports=StdExternalCrate"

- name: Check for feature leaks
run: cargo test --no-default-features
Expand Down
21 changes: 21 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#
# Copyright (c) 2024 ZettaScale Technology
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
# http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
# which is available at https://www.apache.org/licenses/LICENSE-2.0.
#
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
#
# Contributors:
# ZettaScale Zenoh Team, <[email protected]>
#
repos:
- repo: local
hooks:
- id: fmt
name: fmt
entry: cargo fmt -- --config "unstable_features=true,imports_granularity=Crate,group_imports=StdExternalCrate"
language: system
types: [rust]
56 changes: 27 additions & 29 deletions Cargo.lock

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

14 changes: 6 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ version = "0.11.0-dev"
repository = "https://github.com/eclipse-zenoh/zenoh-c"
homepage = "http://zenoh.io"
authors = [
"kydos <[email protected]>",
"Julien Enoch <[email protected]>",
"Olivier Hécart <[email protected]>",
"Luca Cominardi <[email protected]>",
"kydos <[email protected]>",
"Julien Enoch <[email protected]>",
"Olivier Hécart <[email protected]>",
"Luca Cominardi <[email protected]>",
]
edition = "2021"
license = "EPL-2.0 OR Apache-2.0"
Expand All @@ -32,7 +32,7 @@ build = "build.rs"

[features]
logger-autoinit = []
shared-memory = ["zenoh/shared-memory", "zenoh-ext/shared-memory", "zenoh-protocol/shared-memory"]
shared-memory = ["zenoh/shared-memory", "zenoh-ext/shared-memory"]
unstable = ["zenoh/unstable", "zenoh-ext/unstable"]
default = ["zenoh/default"]

Expand All @@ -54,8 +54,6 @@ spin = "0.9.5"
unwrap-infallible = "0.1.5"
const_format = "0.2.32"
zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", default-features = false }
zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" }
zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" }
zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" }
flume = "*"

Expand All @@ -67,7 +65,7 @@ serde_yaml = "0.9.19"
fs_extra = "1.3.0"

[lib]
path="src/lib.rs"
path = "src/lib.rs"
name = "zenohc"
crate-type = ["cdylib", "staticlib"]
doctest = false
Expand Down
Loading

0 comments on commit f3af49c

Please sign in to comment.