Merge pull request #410 from dora-rs/single-binary

dora-rs · Jan 21, 2024 · f0cb965 · f0cb965
2 parents b22edb8 + b79172c
commit f0cb965
Show file tree

Hide file tree

Showing 35 changed files with 392 additions and 416 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -236,8 +236,6 @@ jobs:
         # fail-fast by using bash shell explictly
         shell: bash
         run: |
-          cargo install --path binaries/coordinator --locked
-          cargo install --path binaries/daemon --locked
           cargo install --path binaries/cli --locked
       - name: "Test CLI"
         timeout-minutes: 30

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,6 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-20.04]
-        python-version: ["3.7"]
       fail-fast: false
     runs-on: ${{ matrix.platform }}
 
@@ -72,7 +71,6 @@ jobs:
     strategy:
       matrix:
         platform: [windows-2022]
-        python-version: ["3.7"]
       fail-fast: false
     runs-on: ${{ matrix.platform }}
 
@@ -83,15 +81,13 @@ jobs:
 
       - name: "Build binaries"
         timeout-minutes: 60
-        run: "cargo build --release -p dora-coordinator -p dora-cli -p dora-daemon"
+        run: "cargo build --release -p dora-cli"
 
       - name: Create Archive (Windows)
         if: runner.os == 'Windows'
         shell: powershell
         run: |
           New-Item -Path archive -ItemType Directory
-          Copy-Item target/release/dora-coordinator.exe -Destination archive
-          Copy-Item target/release/dora-daemon.exe -Destination archive
           Copy-Item target/release/dora.exe -Destination archive/dora.exe
           Compress-Archive -Path archive\* -DestinationPath archive.zip
 
@@ -111,7 +107,6 @@ jobs:
     strategy:
       matrix:
         platform: [macos-12, ubuntu-20.04]
-        python-version: ["3.7"]
       fail-fast: false
     runs-on: ${{ matrix.platform }}
 
@@ -122,14 +117,12 @@ jobs:
 
       - name: "Build binaries"
         timeout-minutes: 60
-        run: "cargo build --release -p dora-coordinator -p dora-cli -p dora-daemon"
+        run: "cargo build --release -p dora-cli"
 
       - name: "Create Archive (Unix)"
         if: runner.os == 'Linux' || runner.os == 'macOS'
         run: |
           mkdir archive
-          cp target/release/dora-coordinator archive
-          cp target/release/dora-daemon archive
           cp target/release/dora archive/dora
           cd archive
           zip -r ../archive.zip .
@@ -151,7 +144,6 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-20.04]
-        python-version: ["3.7"]
       fail-fast: false
     runs-on: ${{ matrix.platform }}
 
@@ -166,14 +158,12 @@ jobs:
         with:
           use-cross: true
           command: build
-          args: --release --target aarch64-unknown-linux-gnu -p dora-coordinator -p dora-cli -p dora-daemon
+          args: --release --target aarch64-unknown-linux-gnu -p dora-cli
 
       - name: "Archive Linux ARM64"
         if: runner.os == 'Linux'
         run: |
           mkdir archive_aarch64
-          cp target/aarch64-unknown-linux-gnu/release/dora-coordinator archive_aarch64
-          cp target/aarch64-unknown-linux-gnu/release/dora-daemon archive_aarch64
           cp target/aarch64-unknown-linux-gnu/release/dora archive_aarch64/dora
           cd archive_aarch64
           zip -r ../archive_aarch64.zip .
@@ -196,7 +186,6 @@ jobs:
     strategy:
       matrix:
         platform: [macos-12]
-        python-version: ["3.7"]
       fail-fast: false
     runs-on: ${{ matrix.platform }}
 
@@ -219,8 +208,6 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           mkdir archive_aarch64
-          cp target/aarch64-apple-darwin/release/dora-coordinator archive_aarch64
-          cp target/aarch64-apple-darwin/release/dora-daemon archive_aarch64
           cp target/aarch64-apple-darwin/release/dora archive_aarch64/dora
           cd archive_aarch64
           zip -r ../archive_aarch64.zip .

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -81,7 +81,6 @@ ros2-examples = []
 [dev-dependencies]
 eyre = "0.6.8"
 tokio = "1.24.2"
-dora-daemon = { workspace = true }
 dora-coordinator = { workspace = true }
 dora-core = { workspace = true }
 dora-tracing = { workspace = true }
@@ -90,10 +89,8 @@ dunce = "1.0.2"
 serde_yaml = "0.8.23"
 uuid = { version = "1.2.1", features = ["v4", "serde"] }
 tracing = "0.1.36"
-tracing-subscriber = "0.3.15"
 futures = "0.3.25"
 tokio-stream = "0.1.11"
-clap = { version = "4.0.3", features = ["derive"] }
 
 [[example]]
 name = "c-dataflow"

diff --git a/apis/c/node/Cargo.toml b/apis/c/node/Cargo.toml
@@ -19,7 +19,6 @@ tracing = ["dora-node-api/tracing"]
 
 [dependencies]
 eyre = "0.6.8"
-flume = "0.10.14"
 tracing = "0.1.33"
 arrow-array = { workspace = true }
 

diff --git a/apis/c/operator/build.rs b/apis/c/operator/build.rs
@@ -2,10 +2,10 @@ use std::path::Path;
 
 fn main() {
     dora_operator_api_types::generate_headers(Path::new("operator_types.h"))
-        .expect("failed to create operator_api.h");
+        .expect("failed to create operator_types.h");
 
     // don't rebuild on changes (otherwise we rebuild on every run as we're
     // writing the `operator_types.h` file; cargo will still rerun this script
     // when the `dora_operator_api_types` crate changes)
-    println!("cargo:rerun-if-changed=");
+    println!("cargo:rerun-if-changed=build.rs");
 }
diff --git a/apis/rust/node/Cargo.toml b/apis/rust/node/Cargo.toml
@@ -14,20 +14,13 @@ tracing = ["dep:dora-tracing"]
 dora-core = { workspace = true }
 shared-memory-server = { workspace = true }
 eyre = "0.6.7"
-once_cell = "1.13.0"
-serde = { version = "1.0.136", features = ["derive"] }
 serde_yaml = "0.8.23"
-serde_json = "1.0.89"
-thiserror = "1.0.30"
 tracing = "0.1.33"
 flume = "0.10.14"
-uuid = { version = "1.1.2", features = ["v4"] }
-capnp = "0.14.11"
 bincode = "1.3.3"
 shared_memory_extended = "0.13.0"
 dora-tracing = { workspace = true, optional = true }
 arrow = { workspace = true }
-arrow-schema = { workspace = true }
 futures = "0.3.28"
 futures-concurrency = "7.3.0"
 futures-timer = "3.0.2"

diff --git a/binaries/cli/Cargo.toml b/binaries/cli/Cargo.toml
@@ -35,3 +35,9 @@ ctrlc = "3.2.5"
 tracing = "0.1.36"
 dora-tracing = { workspace = true, optional = true }
 bat = "0.23.0"
+dora-daemon = { workspace = true }
+dora-coordinator = { workspace = true }
+dora-runtime = { workspace = true }
+tokio = { version = "1.20.1", features = ["full"] }
+tokio-stream = { version = "0.1.8", features = ["io-util", "net"] }
+futures = "0.3.21"