Skip to content

Commit

Permalink
Merge pull request #27 from fuzzypixelz/reduce-status-checks
Browse files Browse the repository at this point in the history
Reduce status checks & fix Debian package
  • Loading branch information
kydos authored Jan 12, 2024
2 parents 961feb1 + 52be025 commit 8b13c64
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 18 deletions.
17 changes: 15 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
name: CI

on:
on:
push:
branches: ["**"]
pull_request:
Expand Down Expand Up @@ -55,7 +55,6 @@ jobs:
env:
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse


test:
name: Run tests on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -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")'
20 changes: 8 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>",
"Luca Cominardi <[email protected]>"
"Dmitrii Bannov <[email protected]>",
"Luca Cominardi <[email protected]>",
]
edition = "2021"
repository = "https://github.com/eclipse-zenoh/zenoh-plugin-ros1"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion zenoh-bridge-ros1/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 6 additions & 3 deletions zenoh-plugin-ros1/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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"
Expand All @@ -76,4 +79,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)"

0 comments on commit 8b13c64

Please sign in to comment.