From 84553854758caf446468b0b896e9af2d97cea182 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 11 Jan 2024 17:52:46 +0100 Subject: [PATCH 1/4] chore: Reduce status checks --- .github/workflows/ci.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 19bcce0..aeb3c0c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ # name: CI -on: +on: push: branches: ["**"] pull_request: @@ -55,7 +55,6 @@ jobs: env: CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse - test: name: Run tests on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -91,3 +90,17 @@ jobs: env: CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse ASYNC_STD_THREAD_COUNT: 4 + + # 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: [check, test] + if: always() + steps: + - name: Check whether all jobs pass + run: echo '${{ toJson(needs) }}' | jq -e 'all(.result == "success")' From 2208e2e9b94f97ad14701716a277ced3e6f9deba Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 11 Jan 2024 17:53:29 +0100 Subject: [PATCH 2/4] fix: Specify plugin dep version --- zenoh-bridge-ros1/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zenoh-bridge-ros1/Cargo.toml b/zenoh-bridge-ros1/Cargo.toml index b5787f7..c228068 100644 --- a/zenoh-bridge-ros1/Cargo.toml +++ b/zenoh-bridge-ros1/Cargo.toml @@ -32,7 +32,7 @@ log = { workspace = true } serde_json = { workspace = true } zenoh = { workspace = true } zenoh-plugin-trait = { workspace = true } -zenoh-plugin-ros1 = { path = "../zenoh-plugin-ros1/", default-features = false } +zenoh-plugin-ros1 = { version = "0.11.0-dev", path = "../zenoh-plugin-ros1/", default-features = false } [[bin]] name = "zenoh-bridge-ros1" From 0379e6e4c6410fcd5978ee45e3607a4f1a40bd52 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 11 Jan 2024 17:54:18 +0100 Subject: [PATCH 3/4] fix: Incorrect zenohd deb dep version --- zenoh-plugin-ros1/Cargo.toml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/zenoh-plugin-ros1/Cargo.toml b/zenoh-plugin-ros1/Cargo.toml index d74b898..ffce33a 100644 --- a/zenoh-plugin-ros1/Cargo.toml +++ b/zenoh-plugin-ros1/Cargo.toml @@ -30,7 +30,10 @@ crate-type = ["cdylib", "rlib"] no_mangle = ["zenoh-plugin-trait/no_mangle"] test = [] stats = ["zenoh/stats"] -default = ["no_mangle", "test"] # TODO: https://zettascale.atlassian.net/browse/ZEN-291 +default = [ + "no_mangle", + "test", +] # TODO: https://zettascale.atlassian.net/browse/ZEN-291 [dependencies] atoi = { workspace = true } @@ -54,7 +57,7 @@ zenoh-core = { workspace = true } zenoh-plugin-trait = { workspace = true } hex = { workspace = true } xml-rpc = { workspace = true } -rosrust = { path="../rosrust/rosrust" } +rosrust = { path = "../rosrust/rosrust" } [dev-dependencies] serial_test = "0.10.0" @@ -76,4 +79,4 @@ maintainer = "zenoh-dev@eclipse.org" 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)" From 52be025f282baf173c95b72392c623c177cf5021 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 11 Jan 2024 17:56:46 +0100 Subject: [PATCH 4/4] fix: Incorrect zenoh dep version --- Cargo.toml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 23d007b..5581ea7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,18 +13,14 @@ # [workspace] resolver = "2" -members = [ - "zenoh-bridge-ros1", - "zenoh-plugin-ros1", - "rosrust/rosrust" -] -exclude = [ "rosrust" ] +members = ["zenoh-bridge-ros1", "zenoh-plugin-ros1", "rosrust/rosrust"] +exclude = ["rosrust"] [workspace.package] version = "0.11.0-dev" authors = [ - "Dmitrii Bannov ", - "Luca Cominardi " + "Dmitrii Bannov ", + "Luca Cominardi ", ] edition = "2021" repository = "https://github.com/eclipse-zenoh/zenoh-plugin-ros1" @@ -51,14 +47,14 @@ rand = "0.8.5" strum = "0.24" strum_macros = "0.24" duration-string = "0.3.0" -zenoh = { version = "0.10.0-rc", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release-0.10.0-rc" } -zenoh-ext = { version = "0.10.0-rc", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release-0.10.0-rc" } -zenoh-core = { version = "0.10.0-rc", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release-0.10.0-rc" } -zenoh-plugin-trait = { version = "0.10.0-rc", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release-0.10.0-rc", default-features = false } flume = "0.11" hex = "0.4.3" xml-rpc = "0.0.12" rustc_version = "0.4" +zenoh = { 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" } +zenoh-core = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" } +zenoh-plugin-trait = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master", default-features = false } [profile.release] debug = false