Merge pull request #175 from fuzzypixelz/reduce-status-checks

Reduce status checks & fix Debian package.

.github/workflows/rust.yml → .github/workflows/ci.yml

@@ -11,7 +11,7 @@
 # Contributors:
 #   ZettaScale Zenoh Team, <[email protected]>
 #
-name: Rust
+name: CI
 
 on:
   push:
@@ -63,3 +63,17 @@ jobs:
 
       - name: Run tests
         run: cargo test --verbose
+
+  # NOTE: In GitHub repository settings, the "Require status checks to pass
+  # before merging" branch protection rule ensures that commits are only merged
+  # from branches where specific status checks have passed. These checks are
+  # specified manually as a list of workflow job names. Thus we use this extra
+  # job to signal whether all CI checks have passed.
+  ci:
+    name: CI status checks
+    runs-on: ubuntu-latest
+    needs: build
+    if: always()
+    steps:
+      - name: Check whether all jobs pass
+        run: echo '${{ toJson(needs) }}' | jq -e 'all(.result == "success")'

Cargo.toml

@@ -13,10 +13,7 @@
 #
 [workspace]
 resolver = "2"
-members = [
-  "zenoh-bridge-dds",
-  "zenoh-plugin-dds",
-]
+members = ["zenoh-bridge-dds", "zenoh-plugin-dds"]
 
 [workspace.package]
 version = "0.11.0-dev"
@@ -38,7 +35,7 @@ async-trait = "0.1.66"
 bincode = "1.3.3"
 cdr = "0.2.4"
 clap = "3.2.23"
-cyclors = { git = "https://github.com/kydos/cyclors", branch = "master" }
+cyclors = { version = "0.2.0", git = "https://github.com/ZettaScaleLabs/cyclors.git", branch = "master" }
 derivative = "2.2.0"
 env_logger = "0.10.0"
 flume = "0.11.0"
@@ -51,13 +48,17 @@ regex = "1.7.1"
 rustc_version = "0.4"
 serde = "1.0.154"
 serde_json = "1.0.94"
-zenoh = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master", features = ["unstable"] }
-zenoh-collections = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master" }
-zenoh-core = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master" }
-zenoh-ext = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master", features = ["unstable"] }
-zenoh-plugin-rest = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master", default-features = false }
-zenoh-plugin-trait = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master", default-features = false }
-zenoh-util = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "master", default-features = false }
+zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master", features = [
+    "unstable",
+] }
+zenoh-collections = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" }
+zenoh-core = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" }
+zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master", features = [
+    "unstable",
+] }
+zenoh-plugin-rest = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master", default-features = false }
+zenoh-plugin-trait = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master", default-features = false }
+zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master", default-features = false }
 
 [profile.release]
 debug = false

zenoh-bridge-dds/Cargo.toml

@@ -33,10 +33,10 @@ env_logger = { workspace = true }
 lazy_static = { workspace = true }
 log = { workspace = true }
 serde_json = { workspace = true }
-zenoh  = { workspace = true }
+zenoh = { workspace = true }
 zenoh-plugin-rest = { workspace = true }
 zenoh-plugin-trait = { workspace = true }
-zenoh-plugin-dds = { path = "../zenoh-plugin-dds/", default-features = false }
+zenoh-plugin-dds = { version = "0.11.0-dev", path = "../zenoh-plugin-dds/", default-features = false }
 
 [[bin]]
 name = "zenoh-bridge-dds"

zenoh-plugin-dds/Cargo.toml

@@ -65,4 +65,4 @@ maintainer = "[email protected]"
 copyright = "2017, 2022 ZettaScale Technology Inc."
 section = "net"
 license-file = ["../LICENSE", "0"]
-depends = "zenohd (=0.11.0-dev)"
+depends = "zenohd (=0.11.0-dev-1)"