From ffe686a10d669ad1cfc380d56ab2e2a65a18b30c Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Wed, 2 Nov 2022 14:08:26 -0700 Subject: [PATCH] Pin zenoh git commit Pinning zenoh git version to fix recompilation of the `dora-api-operator` when it is a user dependency. --- Cargo.lock | 42 ++++++++++---------- binaries/cli/Cargo.toml | 2 +- binaries/coordinator/Cargo.toml | 2 +- binaries/runtime/Cargo.toml | 4 +- libraries/communication-layer/Cargo.toml | 4 +- libraries/core/Cargo.toml | 2 +- libraries/extensions/zenoh-logger/Cargo.toml | 4 +- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 32e5a827..45134fb1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4595,7 +4595,7 @@ dependencies = [ [[package]] name = "zenoh" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "async-global-executor", "async-std", @@ -4639,7 +4639,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "async-std", "bincode", @@ -4654,7 +4654,7 @@ dependencies = [ [[package]] name = "zenoh-cfg-properties" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "zenoh-core", "zenoh-macros", @@ -4663,7 +4663,7 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "async-std", "async-trait", @@ -4676,7 +4676,7 @@ dependencies = [ [[package]] name = "zenoh-config" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "flume", "json5", @@ -4694,7 +4694,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "anyhow", "lazy_static", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "aes", "hmac", @@ -4716,7 +4716,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "async-std", "async-trait", @@ -4735,7 +4735,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "async-std", "async-trait", @@ -4750,7 +4750,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "async-std", "async-trait", @@ -4773,7 +4773,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "async-std", "async-trait", @@ -4788,7 +4788,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "async-rustls", "async-std", @@ -4807,7 +4807,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "async-std", "async-trait", @@ -4824,7 +4824,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "async-std", "async-trait", @@ -4849,7 +4849,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "proc-macro2", "quote", @@ -4861,7 +4861,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "libloading", "log", @@ -4874,7 +4874,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "log", "uhlc 0.4.1", @@ -4886,7 +4886,7 @@ dependencies = [ [[package]] name = "zenoh-protocol-core" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "hex", "lazy_static", @@ -4899,7 +4899,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "async-std", "event-listener", @@ -4912,7 +4912,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "async-executor", "async-global-executor", @@ -4939,7 +4939,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.6.0-dev.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git#79a136e4fd90b11ff5d775ced981af53c4f1071b" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?rev=79a136e4fd90b11ff5d775ced981af53c4f1071b#79a136e4fd90b11ff5d775ced981af53c4f1071b" dependencies = [ "async-std", "clap 2.34.0", diff --git a/binaries/cli/Cargo.toml b/binaries/cli/Cargo.toml index c1f99ab4..0016c02e 100644 --- a/binaries/cli/Cargo.toml +++ b/binaries/cli/Cargo.toml @@ -16,7 +16,7 @@ dora-core = { path = "../../libraries/core" } serde_yaml = "0.9.11" tempfile = "3.3.0" webbrowser = "0.8.0" -zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git" } +zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "79a136e4fd90b11ff5d775ced981af53c4f1071b" } serde_json = "1.0.86" termcolor = "1.1.3" atty = "0.2.14" diff --git a/binaries/coordinator/Cargo.toml b/binaries/coordinator/Cargo.toml index 3e242ce7..4c505bb2 100644 --- a/binaries/coordinator/Cargo.toml +++ b/binaries/coordinator/Cargo.toml @@ -25,6 +25,6 @@ dora-message = { path = "../../libraries/message" } tracing = "0.1.36" tracing-subscriber = "0.3.15" futures-concurrency = "5.0.1" -zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git" } +zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "79a136e4fd90b11ff5d775ced981af53c4f1071b" } serde_json = "1.0.86" dora-download = { path = "../../libraries/extensions/download" } diff --git a/binaries/runtime/Cargo.toml b/binaries/runtime/Cargo.toml index 70fa7b92..4cc75328 100644 --- a/binaries/runtime/Cargo.toml +++ b/binaries/runtime/Cargo.toml @@ -29,8 +29,8 @@ libloading = "0.7.3" serde_yaml = "0.8.23" tokio = { version = "1.17.0", features = ["full"] } tokio-stream = "0.1.8" -zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git" } -zenoh-config = { git = "https://github.com/eclipse-zenoh/zenoh.git" } +zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "79a136e4fd90b11ff5d775ced981af53c4f1071b" } +zenoh-config = { git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "79a136e4fd90b11ff5d775ced981af53c4f1071b" } fern = "0.6.1" pyo3 = { version = "0.16.5", features = ["auto-initialize", "eyre"] } flume = "0.10.14" diff --git a/libraries/communication-layer/Cargo.toml b/libraries/communication-layer/Cargo.toml index d42f8c29..b246998d 100644 --- a/libraries/communication-layer/Cargo.toml +++ b/libraries/communication-layer/Cargo.toml @@ -10,8 +10,8 @@ iceoryx = ["dep:iceoryx-rs", "dep:iceoryx-sys"] [dependencies] eyre = "0.6.8" -zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", optional = true } -zenoh-config = { git = "https://github.com/eclipse-zenoh/zenoh.git", optional = true } +zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "79a136e4fd90b11ff5d775ced981af53c4f1071b", optional = true } +zenoh-config = { git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "79a136e4fd90b11ff5d775ced981af53c4f1071b", optional = true } [target.'cfg(unix)'.dependencies] iceoryx-rs = { git = "https://github.com/eclipse-iceoryx/iceoryx-rs.git", optional = true } diff --git a/libraries/core/Cargo.toml b/libraries/core/Cargo.toml index af7fe3fe..e54e9d0b 100644 --- a/libraries/core/Cargo.toml +++ b/libraries/core/Cargo.toml @@ -11,4 +11,4 @@ eyre = "0.6.8" serde = { version = "1.0.136", features = ["derive"] } serde_yaml = "0.9.11" once_cell = "1.13.0" -zenoh-config = { git = "https://github.com/eclipse-zenoh/zenoh.git" } +zenoh-config = { git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "79a136e4fd90b11ff5d775ced981af53c4f1071b" } diff --git a/libraries/extensions/zenoh-logger/Cargo.toml b/libraries/extensions/zenoh-logger/Cargo.toml index 4f4c26c8..1ce72e50 100644 --- a/libraries/extensions/zenoh-logger/Cargo.toml +++ b/libraries/extensions/zenoh-logger/Cargo.toml @@ -7,5 +7,5 @@ license = "Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git" } -zenoh-config = { git = "https://github.com/eclipse-zenoh/zenoh.git" } +zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "79a136e4fd90b11ff5d775ced981af53c4f1071b" } +zenoh-config = { git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "79a136e4fd90b11ff5d775ced981af53c4f1071b" }