Skip to content

Commit 1cce1f5

Browse files
timbottimbot
committed
Pin Zenoh 1.8.0 transport livelock fix
Use the owned Zenoh fork containing eclipse-zenoh/zenoh#2709. Lock both production and opaque-type build graphs to that commit.
1 parent 05bd370 commit 1cce1f5

5 files changed

Lines changed: 80 additions & 80 deletions

File tree

‎Cargo.lock‎

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,18 @@ tokio = "*"
7676
unwrap-infallible = "0.1.5"
7777
const_format = "0.2.32"
7878
flume = "*"
79-
zenoh = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false, features = ["internal"] }
80-
zenoh-ext = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false, features=["internal"] }
81-
zenoh-runtime = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
82-
zenoh-util = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
83-
# zenoh-pinned-deps-1-75 = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
79+
zenoh = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14", default-features = false, features = ["internal"] }
80+
zenoh-ext = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14", default-features = false, features=["internal"] }
81+
zenoh-runtime = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14" }
82+
zenoh-util = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14" }
83+
# zenoh-pinned-deps-1-75 = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14" }
8484

8585
[target.'cfg(unix)'.dependencies]
8686
ctor = "0.4.1"
8787

8888
[build-dependencies]
89-
zenoh = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false, features = ["internal"] }
90-
# zenoh-pinned-deps-1-75 = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
89+
zenoh = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14", default-features = false, features = ["internal"] }
90+
# zenoh-pinned-deps-1-75 = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14" }
9191
cbindgen = "0.29.0"
9292
fs2 = "0.4.3"
9393
regex = "1.11.1"

‎Cargo.toml.in‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,18 @@ tokio = "*"
7676
unwrap-infallible = "0.1.5"
7777
const_format = "0.2.32"
7878
flume = "*"
79-
zenoh = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false, features = ["internal"] }
80-
zenoh-ext = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false, features=["internal"] }
81-
zenoh-runtime = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
82-
zenoh-util = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
83-
@COMMENT_PINNED_DEPS@zenoh-pinned-deps-1-75 = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
79+
zenoh = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14", default-features = false, features = ["internal"] }
80+
zenoh-ext = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14", default-features = false, features=["internal"] }
81+
zenoh-runtime = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14" }
82+
zenoh-util = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14" }
83+
@COMMENT_PINNED_DEPS@zenoh-pinned-deps-1-75 = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14" }
8484

8585
[target.'cfg(unix)'.dependencies]
8686
ctor = "0.4.1"
8787

8888
[build-dependencies]
89-
zenoh = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false, features = ["internal"] }
90-
@COMMENT_PINNED_DEPS@zenoh-pinned-deps-1-75 = { version = "1.8.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
89+
zenoh = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14", default-features = false, features = ["internal"] }
90+
@COMMENT_PINNED_DEPS@zenoh-pinned-deps-1-75 = { version = "1.8.0", git = "https://github.com/timbot/zenoh.git", rev = "acc8a6c2c4b4c7a2404f6401fe8640ff859efa14" }
9191
cbindgen = "0.29.0"
9292
fs2 = "0.4.3"
9393
regex = "1.11.1"

0 commit comments

Comments
 (0)