build system-stats with same workspace

bytebeamio · Aug 29, 2024 · d9b129c · d9b129c
1 parent d224cea
commit d9b129c
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 22 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,13 +23,12 @@ jobs:
           target: x86_64-unknown-linux-musl
 
       - name: Build binary
-        working-directory: tools/${{ matrix.build }}
-        run: cargo build --verbose --release --target x86_64-unknown-linux-musl
+        run: cargo build -p ${{ matrix.build }} --verbose --release --target x86_64-unknown-linux-musl
 
       - name: Upload release archive
         uses: softprops/action-gh-release@v1
         with:
-          files: tools/${{ matrix.build }}/target/x86_64-unknown-linux-musl/release/${{ matrix.build }}
+          files: target/x86_64-unknown-linux-musl/release/${{ matrix.build }}
 
   build-release:
     name: Build release for ${{ matrix.target }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,17 +3,8 @@ serial = { git = "https://github.com/bytebeamio/serial-rs", branch = "android_fi
 
 [workspace]
 resolver = "2"
-members = [
-    "uplink",
-    "storage",
-    "tools/utils",
-]
-exclude = [
-    "tools/deserialize-backup",
-    "tools/simulator",
-    "tools/system-stats",
-    "tools/tunshell",
-]
+members = ["uplink", "storage", "tools/utils", "tools/system-stats"]
+exclude = ["tools/deserialize-backup", "tools/simulator", "tools/tunshell"]
 
 [workspace.dependencies]
 bytes = "1"

diff --git a/tools/system-stats/Cargo.toml b/tools/system-stats/Cargo.toml
@@ -5,14 +5,14 @@ edition = "2021"
 authors = ["Devdutt Shenoi <devdutt@bytebeam.io>"]
 
 [dependencies]
-futures-util = { version = "0.3", features = ["sink"] }
-log = "0.4"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1.0"
+futures-util = { workspace = true, features = ["sink"] }
+log = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 simplelog = "0.12.0"
 structopt = "0.3"
 sysinfo = "0.26"
-thiserror = "1"
-tokio = { version = "1", features = ["rt-multi-thread", "macros", "net"] }
-tokio-stream = "0.1"
-tokio-util = { version = "0.7", features = ["codec", "time"] }
+thiserror = { workspace = true }
+tokio = { workspace = true, features = ["macros", "net"] }
+tokio-stream = { workspace = true }
+tokio-util = { workspace = true }