From d8260d5d2c0028019bbfa459ff4446bcfa3056c9 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Wed, 7 Dec 2022 17:30:18 +0100 Subject: [PATCH 1/7] Inherit package version from workspace root This way, we don't need to update the version manually in all sub-crates on every release. --- Cargo.toml | 4 ++++ apis/c++/node/Cargo.toml | 2 +- apis/c++/operator/Cargo.toml | 2 +- apis/c/node/Cargo.toml | 2 +- apis/c/operator/Cargo.toml | 2 +- apis/python/operator/Cargo.toml | 2 +- apis/rust/node/Cargo.toml | 2 +- apis/rust/operator/Cargo.toml | 2 +- apis/rust/operator/macros/Cargo.toml | 2 +- apis/rust/operator/types/Cargo.toml | 2 +- binaries/cli/Cargo.toml | 2 +- binaries/coordinator/Cargo.toml | 2 +- binaries/runtime/Cargo.toml | 2 +- examples/iceoryx/node/Cargo.toml | 2 +- examples/iceoryx/operator/Cargo.toml | 2 +- examples/iceoryx/sink/Cargo.toml | 2 +- examples/rust-dataflow-url/sink/Cargo.toml | 2 +- examples/rust-dataflow/node/Cargo.toml | 2 +- examples/rust-dataflow/operator/Cargo.toml | 2 +- examples/rust-dataflow/sink/Cargo.toml | 2 +- libraries/communication-layer/pub-sub/Cargo.toml | 2 +- libraries/communication-layer/request-reply/Cargo.toml | 2 +- libraries/core/Cargo.toml | 2 +- libraries/extensions/download/Cargo.toml | 2 +- libraries/extensions/telemetry/metrics/Cargo.toml | 2 +- libraries/extensions/telemetry/tracing/Cargo.toml | 2 +- libraries/extensions/zenoh-logger/Cargo.toml | 2 +- libraries/message/Cargo.toml | 2 +- 28 files changed, 31 insertions(+), 27 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d98953ff..53d8b14c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,12 +18,16 @@ members = [ "libraries/extensions/zenoh-logger", ] +[workspace.package] +version = "0.1.1" + [package] name = "dora-examples" version = "0.0.0" edition = "2021" license = "Apache-2.0" + [dev-dependencies] eyre = "0.6.8" tokio = "1.20.1" diff --git a/apis/c++/node/Cargo.toml b/apis/c++/node/Cargo.toml index 4c60e9a5..69b5e485 100644 --- a/apis/c++/node/Cargo.toml +++ b/apis/c++/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-node-api-cxx" -version = "0.1.1" +version.workspace = true edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/apis/c++/operator/Cargo.toml b/apis/c++/operator/Cargo.toml index 9f359563..cb14297e 100644 --- a/apis/c++/operator/Cargo.toml +++ b/apis/c++/operator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-operator-api-cxx" -version = "0.1.1" +version.workspace = true edition = "2021" [lib] diff --git a/apis/c/node/Cargo.toml b/apis/c/node/Cargo.toml index c8cf6366..8a1d0410 100644 --- a/apis/c/node/Cargo.toml +++ b/apis/c/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-node-api-c" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" diff --git a/apis/c/operator/Cargo.toml b/apis/c/operator/Cargo.toml index 82d857f8..a9d98333 100644 --- a/apis/c/operator/Cargo.toml +++ b/apis/c/operator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-operator-api-c" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" description = "C API implemetation for Dora Operator" diff --git a/apis/python/operator/Cargo.toml b/apis/python/operator/Cargo.toml index fd3a42b7..2d1efcb2 100644 --- a/apis/python/operator/Cargo.toml +++ b/apis/python/operator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-operator-api-python" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" diff --git a/apis/rust/node/Cargo.toml b/apis/rust/node/Cargo.toml index fd790684..0a0d6638 100644 --- a/apis/rust/node/Cargo.toml +++ b/apis/rust/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-node-api" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" diff --git a/apis/rust/operator/Cargo.toml b/apis/rust/operator/Cargo.toml index 233b42d8..144cc216 100644 --- a/apis/rust/operator/Cargo.toml +++ b/apis/rust/operator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-operator-api" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" description = "Rust API implemetation for Dora Operator" diff --git a/apis/rust/operator/macros/Cargo.toml b/apis/rust/operator/macros/Cargo.toml index 066d808c..4f2c6e32 100644 --- a/apis/rust/operator/macros/Cargo.toml +++ b/apis/rust/operator/macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-operator-api-macros" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" description = "Rust API Macros for Dora Operator" diff --git a/apis/rust/operator/types/Cargo.toml b/apis/rust/operator/types/Cargo.toml index 2d6cbc21..156264c5 100644 --- a/apis/rust/operator/types/Cargo.toml +++ b/apis/rust/operator/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-operator-api-types" -version = "0.1.1" +version.workspace = true edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/binaries/cli/Cargo.toml b/binaries/cli/Cargo.toml index 96c77e33..0c504b51 100644 --- a/binaries/cli/Cargo.toml +++ b/binaries/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-cli" -version = "0.1.1" +version.workspace = true edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/binaries/coordinator/Cargo.toml b/binaries/coordinator/Cargo.toml index fc3f18b8..7255a9be 100644 --- a/binaries/coordinator/Cargo.toml +++ b/binaries/coordinator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-coordinator" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" diff --git a/binaries/runtime/Cargo.toml b/binaries/runtime/Cargo.toml index 97b65b03..c285eb0f 100644 --- a/binaries/runtime/Cargo.toml +++ b/binaries/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-runtime" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" diff --git a/examples/iceoryx/node/Cargo.toml b/examples/iceoryx/node/Cargo.toml index 66bea6e5..474d81a7 100644 --- a/examples/iceoryx/node/Cargo.toml +++ b/examples/iceoryx/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iceoryx-example-node" -version = "0.1.1" +version.workspace = true edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/iceoryx/operator/Cargo.toml b/examples/iceoryx/operator/Cargo.toml index eb5f3032..6b1368e6 100644 --- a/examples/iceoryx/operator/Cargo.toml +++ b/examples/iceoryx/operator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iceoryx-example-operator" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" diff --git a/examples/iceoryx/sink/Cargo.toml b/examples/iceoryx/sink/Cargo.toml index 4f3b049e..1238d5e8 100644 --- a/examples/iceoryx/sink/Cargo.toml +++ b/examples/iceoryx/sink/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iceoryx-example-sink" -version = "0.1.1" +version.workspace = true edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/rust-dataflow-url/sink/Cargo.toml b/examples/rust-dataflow-url/sink/Cargo.toml index f98c5d28..8f0d14eb 100644 --- a/examples/rust-dataflow-url/sink/Cargo.toml +++ b/examples/rust-dataflow-url/sink/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rust-dataflow-example-sink" -version = "0.1.1" +version.workspace = true edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/rust-dataflow/node/Cargo.toml b/examples/rust-dataflow/node/Cargo.toml index 71f91475..cefcdd47 100644 --- a/examples/rust-dataflow/node/Cargo.toml +++ b/examples/rust-dataflow/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rust-dataflow-example-node" -version = "0.1.1" +version.workspace = true edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/rust-dataflow/operator/Cargo.toml b/examples/rust-dataflow/operator/Cargo.toml index e18c676c..2422f1fa 100644 --- a/examples/rust-dataflow/operator/Cargo.toml +++ b/examples/rust-dataflow/operator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rust-dataflow-example-operator" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" diff --git a/examples/rust-dataflow/sink/Cargo.toml b/examples/rust-dataflow/sink/Cargo.toml index f98c5d28..8f0d14eb 100644 --- a/examples/rust-dataflow/sink/Cargo.toml +++ b/examples/rust-dataflow/sink/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rust-dataflow-example-sink" -version = "0.1.1" +version.workspace = true edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/libraries/communication-layer/pub-sub/Cargo.toml b/libraries/communication-layer/pub-sub/Cargo.toml index 525e5093..8eb1c92e 100644 --- a/libraries/communication-layer/pub-sub/Cargo.toml +++ b/libraries/communication-layer/pub-sub/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "communication-layer-pub-sub" -version = "0.1.1" +version.workspace = true edition = "2021" [features] diff --git a/libraries/communication-layer/request-reply/Cargo.toml b/libraries/communication-layer/request-reply/Cargo.toml index e580b981..61b9a59d 100644 --- a/libraries/communication-layer/request-reply/Cargo.toml +++ b/libraries/communication-layer/request-reply/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "communication-layer-request-reply" -version = "0.1.1" +version.workspace = true edition = "2021" [features] diff --git a/libraries/core/Cargo.toml b/libraries/core/Cargo.toml index d419f7fb..494e6160 100644 --- a/libraries/core/Cargo.toml +++ b/libraries/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-core" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" diff --git a/libraries/extensions/download/Cargo.toml b/libraries/extensions/download/Cargo.toml index ad851bc6..6155a6e4 100644 --- a/libraries/extensions/download/Cargo.toml +++ b/libraries/extensions/download/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-download" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" diff --git a/libraries/extensions/telemetry/metrics/Cargo.toml b/libraries/extensions/telemetry/metrics/Cargo.toml index 77c1620d..57d31315 100644 --- a/libraries/extensions/telemetry/metrics/Cargo.toml +++ b/libraries/extensions/telemetry/metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-metrics" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" diff --git a/libraries/extensions/telemetry/tracing/Cargo.toml b/libraries/extensions/telemetry/tracing/Cargo.toml index ccc59e57..2dd5ae4e 100644 --- a/libraries/extensions/telemetry/tracing/Cargo.toml +++ b/libraries/extensions/telemetry/tracing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-tracing" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" diff --git a/libraries/extensions/zenoh-logger/Cargo.toml b/libraries/extensions/zenoh-logger/Cargo.toml index 1782b11a..7ef5d588 100644 --- a/libraries/extensions/zenoh-logger/Cargo.toml +++ b/libraries/extensions/zenoh-logger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zenoh-logger" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" diff --git a/libraries/message/Cargo.toml b/libraries/message/Cargo.toml index e39d4f9d..382f61dc 100644 --- a/libraries/message/Cargo.toml +++ b/libraries/message/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-message" -version = "0.1.1" +version.workspace = true edition = "2021" license = "Apache-2.0" From ce4fd8b027f173cac0bf727165e2997de98f8bf6 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Wed, 7 Dec 2022 17:39:35 +0100 Subject: [PATCH 2/7] Set dora subcrate dependencies as workspace dependencies --- Cargo.toml | 5 +++++ apis/c++/node/Cargo.toml | 4 +--- apis/c++/operator/Cargo.toml | 2 +- binaries/coordinator/Cargo.toml | 2 +- binaries/runtime/Cargo.toml | 2 +- examples/iceoryx/node/Cargo.toml | 2 +- examples/iceoryx/sink/Cargo.toml | 2 +- examples/rust-dataflow-url/sink/Cargo.toml | 2 +- examples/rust-dataflow/node/Cargo.toml | 2 +- examples/rust-dataflow/sink/Cargo.toml | 2 +- 10 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 53d8b14c..a0d04f9b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,6 +21,11 @@ members = [ [workspace.package] version = "0.1.1" +[workspace.dependencies] +dora-node-api = { version = "0.1.1", path = "apis/rust/node", default-features = false } +dora-operator-api = { version = "0.1.1", path = "apis/rust/operator", default-features = false } +dora-core = { version = "0.1.1", path = "libraries/core" } + [package] name = "dora-examples" version = "0.0.0" diff --git a/apis/c++/node/Cargo.toml b/apis/c++/node/Cargo.toml index 69b5e485..5292ff0b 100644 --- a/apis/c++/node/Cargo.toml +++ b/apis/c++/node/Cargo.toml @@ -10,9 +10,7 @@ crate-type = ["staticlib"] [dependencies] cxx = "1.0.73" -dora-node-api = { version = "0.1.1", path = "../../../apis/rust/node", default-features = false, features = [ - "zenoh", -] } +dora-node-api = { workspace = true, features = ["zenoh"] } eyre = "0.6.8" [build-dependencies] diff --git a/apis/c++/operator/Cargo.toml b/apis/c++/operator/Cargo.toml index cb14297e..6e3a4a82 100644 --- a/apis/c++/operator/Cargo.toml +++ b/apis/c++/operator/Cargo.toml @@ -8,7 +8,7 @@ crate-type = ["staticlib"] [dependencies] cxx = "1.0.73" -dora-operator-api = { version = "0.1.1", path = "../../../apis/rust/operator" } +dora-operator-api = { workspace = true } eyre = "0.6.8" futures = "0.3.21" rand = "0.8.5" diff --git a/binaries/coordinator/Cargo.toml b/binaries/coordinator/Cargo.toml index 7255a9be..e0379ab6 100644 --- a/binaries/coordinator/Cargo.toml +++ b/binaries/coordinator/Cargo.toml @@ -20,7 +20,7 @@ clap = { version = "3.1.8", features = ["derive"] } uuid = { version = "1.2.1" } time = "0.3.9" rand = "0.8.5" -dora-core = { version = "0.1.1", path = "../../libraries/core" } +dora-core = { workspace = true } dora-message = { path = "../../libraries/message" } tracing = "0.1.36" tracing-subscriber = "0.3.15" diff --git a/binaries/runtime/Cargo.toml b/binaries/runtime/Cargo.toml index c285eb0f..71600cde 100644 --- a/binaries/runtime/Cargo.toml +++ b/binaries/runtime/Cargo.toml @@ -14,7 +14,7 @@ dora-node-api = { path = "../../apis/rust/node", default-features = false, featu ] } dora-operator-api-python = { path = "../../apis/python/operator" } dora-operator-api-types = { path = "../../apis/rust/operator/types" } -dora-core = { version = "0.1.1", path = "../../libraries/core" } +dora-core = { workspace = true } dora-tracing = { path = "../../libraries/extensions/telemetry/tracing", optional = true } dora-metrics = { path = "../../libraries/extensions/telemetry/metrics", optional = true } opentelemetry = { version = "0.17", features = [ diff --git a/examples/iceoryx/node/Cargo.toml b/examples/iceoryx/node/Cargo.toml index 474d81a7..7ecdc899 100644 --- a/examples/iceoryx/node/Cargo.toml +++ b/examples/iceoryx/node/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dora-node-api = { version = "0.1.1", path = "../../../apis/rust/node" } +dora-node-api = { workspace = true } eyre = "0.6.8" rand = "0.8.5" diff --git a/examples/iceoryx/sink/Cargo.toml b/examples/iceoryx/sink/Cargo.toml index 1238d5e8..ae81e625 100644 --- a/examples/iceoryx/sink/Cargo.toml +++ b/examples/iceoryx/sink/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dora-node-api = { version = "0.1.1", path = "../../../apis/rust/node" } +dora-node-api = { workspace = true } eyre = "0.6.8" futures = "0.3.21" tokio = { version = "1.20.1", features = ["macros"] } diff --git a/examples/rust-dataflow-url/sink/Cargo.toml b/examples/rust-dataflow-url/sink/Cargo.toml index 8f0d14eb..11f967e0 100644 --- a/examples/rust-dataflow-url/sink/Cargo.toml +++ b/examples/rust-dataflow-url/sink/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dora-node-api = { version = "0.1.1", path = "../../../apis/rust/node" } +dora-node-api = { workspace = true } eyre = "0.6.8" diff --git a/examples/rust-dataflow/node/Cargo.toml b/examples/rust-dataflow/node/Cargo.toml index cefcdd47..e9db92d9 100644 --- a/examples/rust-dataflow/node/Cargo.toml +++ b/examples/rust-dataflow/node/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dora-node-api = { version = "0.1.1", path = "../../../apis/rust/node" } +dora-node-api = { workspace = true } eyre = "0.6.8" futures = "0.3.21" rand = "0.8.5" diff --git a/examples/rust-dataflow/sink/Cargo.toml b/examples/rust-dataflow/sink/Cargo.toml index 8f0d14eb..11f967e0 100644 --- a/examples/rust-dataflow/sink/Cargo.toml +++ b/examples/rust-dataflow/sink/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dora-node-api = { version = "0.1.1", path = "../../../apis/rust/node" } +dora-node-api = { workspace = true } eyre = "0.6.8" From 2ba6b1c41c8899dba2b6f72e46b47c3617b822bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Dec 2022 09:52:05 +0000 Subject: [PATCH 3/7] Bump capnp from 0.14.9 to 0.14.11 (#158) Bumps [capnp](https://github.com/capnproto/capnproto-rust) from 0.14.9 to 0.14.11. - [Release notes](https://github.com/capnproto/capnproto-rust/releases) - [Commits](https://github.com/capnproto/capnproto-rust/compare/capnp-v0.14.9...capnp-v0.14.11) --- updated-dependencies: - dependency-name: capnp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- apis/rust/node/Cargo.toml | 2 +- libraries/message/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a8d11497..82d2809b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -370,9 +370,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "capnp" -version = "0.14.9" +version = "0.14.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b5dbbbfbae370eb9e9e86fb86b572acf4d5e0072e44636758cae3fe6ba6015" +checksum = "2dca085c2c7d9d65ad749d450b19b551efaa8e3476a439bdca07aca8533097f3" [[package]] name = "capnpc" diff --git a/apis/rust/node/Cargo.toml b/apis/rust/node/Cargo.toml index fd790684..665b1ed7 100644 --- a/apis/rust/node/Cargo.toml +++ b/apis/rust/node/Cargo.toml @@ -21,7 +21,7 @@ tracing-subscriber = { version = "0.3.15", optional = true } flume = "0.10.14" communication-layer-pub-sub = { path = "../../../libraries/communication-layer/pub-sub", default-features = false } uuid = { version = "1.1.2", features = ["v4"] } -capnp = "0.14.9" +capnp = "0.14.11" dora-message = { path = "../../../libraries/message" } dora-core = { path = "../../../libraries/core" } diff --git a/libraries/message/Cargo.toml b/libraries/message/Cargo.toml index e39d4f9d..5f0bbea6 100644 --- a/libraries/message/Cargo.toml +++ b/libraries/message/Cargo.toml @@ -12,7 +12,7 @@ build = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -capnp = { version = "0.14.6", features = ["unaligned"] } +capnp = { version = "0.14.11", features = ["unaligned"] } uhlc = "0.5.1" [build-dependencies] From 33c4cc0b6026f0aeadeb7910f6391a58755d649e Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 15 Dec 2022 12:32:31 +0100 Subject: [PATCH 4/7] Fix: enable required node-api features for examples --- examples/iceoryx/node/Cargo.toml | 2 +- examples/iceoryx/sink/Cargo.toml | 2 +- examples/rust-dataflow-url/sink/Cargo.toml | 2 +- examples/rust-dataflow/node/Cargo.toml | 2 +- examples/rust-dataflow/sink/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/iceoryx/node/Cargo.toml b/examples/iceoryx/node/Cargo.toml index 7ecdc899..968b9a3e 100644 --- a/examples/iceoryx/node/Cargo.toml +++ b/examples/iceoryx/node/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dora-node-api = { workspace = true } +dora-node-api = { workspace = true, features = ["iceoryx"] } eyre = "0.6.8" rand = "0.8.5" diff --git a/examples/iceoryx/sink/Cargo.toml b/examples/iceoryx/sink/Cargo.toml index ae81e625..5774709e 100644 --- a/examples/iceoryx/sink/Cargo.toml +++ b/examples/iceoryx/sink/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dora-node-api = { workspace = true } +dora-node-api = { workspace = true, features = ["iceoryx"] } eyre = "0.6.8" futures = "0.3.21" tokio = { version = "1.20.1", features = ["macros"] } diff --git a/examples/rust-dataflow-url/sink/Cargo.toml b/examples/rust-dataflow-url/sink/Cargo.toml index 11f967e0..c0499929 100644 --- a/examples/rust-dataflow-url/sink/Cargo.toml +++ b/examples/rust-dataflow-url/sink/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dora-node-api = { workspace = true } +dora-node-api = { workspace = true, features = ["zenoh"] } eyre = "0.6.8" diff --git a/examples/rust-dataflow/node/Cargo.toml b/examples/rust-dataflow/node/Cargo.toml index e9db92d9..20f36222 100644 --- a/examples/rust-dataflow/node/Cargo.toml +++ b/examples/rust-dataflow/node/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dora-node-api = { workspace = true } +dora-node-api = { workspace = true, features = ["zenoh"] } eyre = "0.6.8" futures = "0.3.21" rand = "0.8.5" diff --git a/examples/rust-dataflow/sink/Cargo.toml b/examples/rust-dataflow/sink/Cargo.toml index 11f967e0..c0499929 100644 --- a/examples/rust-dataflow/sink/Cargo.toml +++ b/examples/rust-dataflow/sink/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dora-node-api = { workspace = true } +dora-node-api = { workspace = true, features = ["zenoh"] } eyre = "0.6.8" From 01f85ca7cb3c5d351664b2205e3327393e6484bc Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Thu, 15 Dec 2022 11:23:54 -0500 Subject: [PATCH 5/7] Use generic linux version when distributing dora --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 05a29b61..0a882afe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - platform: [ubuntu-20.04, ubuntu-22.04, macos-12, windows-2022] + platform: [ubuntu-20.04, macos-12, windows-2022] python-version: ["3.7"] fail-fast: false runs-on: ${{ matrix.platform }} @@ -65,5 +65,5 @@ jobs: with: upload_url: ${{ github.event.release.upload_url }} asset_path: archive.zip - asset_name: dora-${{ github.ref_name }}-x86_64-${{ matrix.platform }}.zip + asset_name: dora-${{ github.ref_name }}-x86_64-${{ runner.os }}.zip asset_content_type: application/zip From 15e42c19ae2af0639c78d852d300c915a1453520 Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Mon, 19 Dec 2022 12:48:55 -0500 Subject: [PATCH 6/7] Bumping dora version --- Cargo.lock | 54 +++++++++---------- Cargo.toml | 8 +-- apis/python/node/Cargo.toml | 2 +- .../template/rust/node/Cargo-template.toml | 2 +- .../rust/operator/Cargo-template.toml | 2 +- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 82d2809b..8e6c67ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -529,7 +529,7 @@ dependencies = [ [[package]] name = "communication-layer-pub-sub" -version = "0.1.1" +version = "0.1.2" dependencies = [ "eyre", "iceoryx-rs", @@ -540,7 +540,7 @@ dependencies = [ [[package]] name = "communication-layer-request-reply" -version = "0.1.1" +version = "0.1.2" dependencies = [ "eyre", ] @@ -891,7 +891,7 @@ dependencies = [ [[package]] name = "dora-cli" -version = "0.1.1" +version = "0.1.2" dependencies = [ "atty", "clap 4.0.3", @@ -911,7 +911,7 @@ dependencies = [ [[package]] name = "dora-coordinator" -version = "0.1.1" +version = "0.1.2" dependencies = [ "bincode", "clap 3.2.20", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "dora-core" -version = "0.1.1" +version = "0.1.2" dependencies = [ "eyre", "once_cell", @@ -954,7 +954,7 @@ dependencies = [ [[package]] name = "dora-download" -version = "0.1.1" +version = "0.1.2" dependencies = [ "eyre", "reqwest", @@ -975,7 +975,7 @@ dependencies = [ [[package]] name = "dora-message" -version = "0.1.1" +version = "0.1.2" dependencies = [ "capnp", "capnpc", @@ -984,7 +984,7 @@ dependencies = [ [[package]] name = "dora-metrics" -version = "0.1.1" +version = "0.1.2" dependencies = [ "futures", "opentelemetry", @@ -995,7 +995,7 @@ dependencies = [ [[package]] name = "dora-node-api" -version = "0.1.1" +version = "0.1.2" dependencies = [ "capnp", "communication-layer-pub-sub", @@ -1015,7 +1015,7 @@ dependencies = [ [[package]] name = "dora-node-api-c" -version = "0.1.1" +version = "0.1.2" dependencies = [ "dora-node-api", "eyre", @@ -1025,7 +1025,7 @@ dependencies = [ [[package]] name = "dora-node-api-cxx" -version = "0.1.1" +version = "0.1.2" dependencies = [ "cxx", "cxx-build", @@ -1035,7 +1035,7 @@ dependencies = [ [[package]] name = "dora-node-api-python" -version = "0.1.1-2" +version = "0.1.2" dependencies = [ "dora-node-api", "dora-operator-api-python", @@ -1048,7 +1048,7 @@ dependencies = [ [[package]] name = "dora-operator-api" -version = "0.1.1" +version = "0.1.2" dependencies = [ "dora-operator-api-macros", "dora-operator-api-types", @@ -1056,14 +1056,14 @@ dependencies = [ [[package]] name = "dora-operator-api-c" -version = "0.1.1" +version = "0.1.2" dependencies = [ "dora-operator-api-types", ] [[package]] name = "dora-operator-api-cxx" -version = "0.1.1" +version = "0.1.2" dependencies = [ "cxx", "cxx-build", @@ -1076,7 +1076,7 @@ dependencies = [ [[package]] name = "dora-operator-api-macros" -version = "0.1.1" +version = "0.1.2" dependencies = [ "dora-operator-api", "dora-operator-api-types", @@ -1087,7 +1087,7 @@ dependencies = [ [[package]] name = "dora-operator-api-python" -version = "0.1.1" +version = "0.1.2" dependencies = [ "dora-node-api", "eyre", @@ -1098,14 +1098,14 @@ dependencies = [ [[package]] name = "dora-operator-api-types" -version = "0.1.1" +version = "0.1.2" dependencies = [ "safer-ffi", ] [[package]] name = "dora-runtime" -version = "0.1.1" +version = "0.1.2" dependencies = [ "clap 3.2.20", "dora-core", @@ -1136,7 +1136,7 @@ dependencies = [ [[package]] name = "dora-tracing" -version = "0.1.1" +version = "0.1.2" dependencies = [ "opentelemetry", "opentelemetry-jaeger", @@ -1665,7 +1665,7 @@ dependencies = [ [[package]] name = "iceoryx-example-node" -version = "0.1.1" +version = "0.1.2" dependencies = [ "dora-node-api", "eyre", @@ -1674,14 +1674,14 @@ dependencies = [ [[package]] name = "iceoryx-example-operator" -version = "0.1.1" +version = "0.1.2" dependencies = [ "dora-operator-api", ] [[package]] name = "iceoryx-example-sink" -version = "0.1.1" +version = "0.1.2" dependencies = [ "dora-node-api", "eyre", @@ -3251,7 +3251,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-node" -version = "0.1.1" +version = "0.1.2" dependencies = [ "dora-node-api", "eyre", @@ -3262,14 +3262,14 @@ dependencies = [ [[package]] name = "rust-dataflow-example-operator" -version = "0.1.1" +version = "0.1.2" dependencies = [ "dora-operator-api", ] [[package]] name = "rust-dataflow-example-sink" -version = "0.1.1" +version = "0.1.2" dependencies = [ "dora-node-api", "eyre", @@ -4924,7 +4924,7 @@ dependencies = [ [[package]] name = "zenoh-logger" -version = "0.1.1" +version = "0.1.2" dependencies = [ "zenoh", "zenoh-config", diff --git a/Cargo.toml b/Cargo.toml index a0d04f9b..d04d0faf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,12 +19,12 @@ members = [ ] [workspace.package] -version = "0.1.1" +version = "0.1.2" [workspace.dependencies] -dora-node-api = { version = "0.1.1", path = "apis/rust/node", default-features = false } -dora-operator-api = { version = "0.1.1", path = "apis/rust/operator", default-features = false } -dora-core = { version = "0.1.1", path = "libraries/core" } +dora-node-api = { version = "0.1.2", path = "apis/rust/node", default-features = false } +dora-operator-api = { version = "0.1.2", path = "apis/rust/operator", default-features = false } +dora-core = { version = "0.1.2", path = "libraries/core" } [package] name = "dora-examples" diff --git a/apis/python/node/Cargo.toml b/apis/python/node/Cargo.toml index fdce146c..fdffc278 100644 --- a/apis/python/node/Cargo.toml +++ b/apis/python/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dora-node-api-python" -version = "0.1.1-2" +version.workspace = true edition = "2021" license = "Apache-2.0" diff --git a/binaries/cli/src/template/rust/node/Cargo-template.toml b/binaries/cli/src/template/rust/node/Cargo-template.toml index 518d4272..0052894b 100644 --- a/binaries/cli/src/template/rust/node/Cargo-template.toml +++ b/binaries/cli/src/template/rust/node/Cargo-template.toml @@ -6,4 +6,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dora-node-api = { git = "https://github.com/dora-rs/dora.git", tag = "v0.1.1" } +dora-node-api = { git = "https://github.com/dora-rs/dora.git", tag = "v0.1.2" } diff --git a/binaries/cli/src/template/rust/operator/Cargo-template.toml b/binaries/cli/src/template/rust/operator/Cargo-template.toml index 32317f32..fe920b45 100644 --- a/binaries/cli/src/template/rust/operator/Cargo-template.toml +++ b/binaries/cli/src/template/rust/operator/Cargo-template.toml @@ -9,4 +9,4 @@ edition = "2021" crate-type = ["cdylib"] [dependencies] -dora-operator-api = { git = "https://github.com/dora-rs/dora.git", tag = "v0.1.1" } +dora-operator-api = { git = "https://github.com/dora-rs/dora.git", tag = "v0.1.2" } From cf16734aa281f87dadba80e8f384d2317a57bde6 Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Mon, 19 Dec 2022 12:49:17 -0500 Subject: [PATCH 7/7] Minor documentation update --- README.md | 4 ++-- docs/src/installation.md | 31 +++++++++++++++++-------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index c36b2cfc..bfede138 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Dataflow Oriented Robotic Architecture ⚡ This project is in early development, and many features have yet to be implemented with breaking changes. Please don't take for granted the current design. -`dora` primary support is with `Linux` ( Ubuntu 20.04 and Ubuntu 22.04 ) as it is the primary OS for both Cloud and small computers. If you wish to use `dora` with another OS, please compile from source. +`dora` primary support is with `Linux` as it is the primary OS for both Cloud and small computers. If you wish to use `dora` with another OS, please compile from source. --- ## 📖 Documentation @@ -101,7 +101,7 @@ communication: nodes: - id: op_1 operator: - python: https://raw.githubusercontent.com/dora-rs/dora-drives/main/operators/webcam.py + python: https://raw.githubusercontent.com/dora-rs/dora-drives/main/operators/webcam_op.py inputs: tick: dora/timer/millis/100 outputs: diff --git a/docs/src/installation.md b/docs/src/installation.md index 9492b2c4..3e0c5270 100644 --- a/docs/src/installation.md +++ b/docs/src/installation.md @@ -2,28 +2,31 @@ This project is in early development, and many features have yet to be implemented with breaking changes. Please don't take for granted the current design. The installation process will be streamlined in the future. -### 1. Compile the dora-coordinator +### Download the binaries from Github -The `dora-coordinator` is responsible for reading the dataflow descriptor file and launching the operators accordingly. -Build it using: +Install `dora` binaries from GitHub releases: + ```bash -git clone https://github.com/dora-rs/dora.git -cd dora -cargo build -p dora-coordinator --release +wget https://github.com/dora-rs/dora/releases/download//dora--x86_64-Linux.zip +unzip dora--x86_64-Linux.zip +python3 -m pip install dora-rs== ## For Python API +PATH=$PATH:$(pwd):$(pwd)/iceoryx +dora --help ``` -### 2. Compile the dora-runtime for operators +#### Or compile from Source -The `dora-runtime` is responsible for managing a set of operators. +Build it using: ```bash -cargo build -p dora-runtime --release +git clone https://github.com/dora-rs/dora.git +cd dora +cargo build -p dora-coordinator -p dora-runtime --release +PATH=$PATH:$(pwd)/target/release ``` -### 3. Add those binaries to your path - -This step is optional. You can also refer to the executables using their full path or copy them somewhere else. - +If you want to use `Iceoryx`. Add `iox-roudi` to the path. +You can find `iox-roudi` with: ```bash -export PATH=$PATH:$(pwd)/target/release +find target -type f -wholename "*/iceoryx-install/bin/iox-roudi" ``` \ No newline at end of file