From 845f8a96cdcbaa65e344160905c2ccfa8d9028b7 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 11 Jan 2024 17:13:10 +0100 Subject: [PATCH 1/9] chore: Pull cyclors from ZettaScaleLabs --- Cargo.lock | 2 +- Cargo.toml | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9485c482..17249a76 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -932,7 +932,7 @@ dependencies = [ [[package]] name = "cyclors" version = "0.2.0" -source = "git+https://github.com/kydos/cyclors?branch=master#c1be4c46e652e4234bd5c25369f990ad0fc3f386" +source = "git+https://github.com/ZettaScaleLabs/cyclors?branch=master#c1be4c46e652e4234bd5c25369f990ad0fc3f386" dependencies = [ "bincode", "bindgen", diff --git a/Cargo.toml b/Cargo.toml index 50f38c65..3deee2be 100644 --- a/Cargo.toml +++ b/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 = { git = "https://github.com/ZettaScaleLabs/cyclors", branch = "master" } derivative = "2.2.0" env_logger = "0.10.0" flume = "0.11.0" @@ -51,10 +48,14 @@ 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 = { 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-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 } From 2f8751c411a5a544957d4a6d40750141c91e1b78 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 11 Jan 2024 17:14:58 +0100 Subject: [PATCH 2/9] fix: Specify cyclors version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3deee2be..82e0d1f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,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/ZettaScaleLabs/cyclors", branch = "master" } +cyclors = { version = "0.2.0", git = "https://github.com/ZettaScaleLabs/cyclors", branch = "master" } derivative = "2.2.0" env_logger = "0.10.0" flume = "0.11.0" From c92a56ce514c61d3f481741f90caf39599075f00 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 11 Jan 2024 17:16:10 +0100 Subject: [PATCH 3/9] chore: Specify version of zenoh deps --- Cargo.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 82e0d1f7..18fe3f4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,17 +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 = [ +zenoh = { version = "0.11.0-dev", 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 = [ +zenoh-collections = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh", branch = "master" } +zenoh-core = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh", branch = "master" } +zenoh-ext = { version = "0.11.0-dev", 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-plugin-rest = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh", branch = "master", default-features = false } +zenoh-plugin-trait = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh", branch = "master", default-features = false } +zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh", branch = "master", default-features = false } [profile.release] debug = false From 0435aa10cd859db944362ec7218f6c49284f0b56 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 11 Jan 2024 17:16:56 +0100 Subject: [PATCH 4/9] chore: Specify version of plugin dep --- zenoh-bridge-dds/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zenoh-bridge-dds/Cargo.toml b/zenoh-bridge-dds/Cargo.toml index d744cf2e..23644a1e 100644 --- a/zenoh-bridge-dds/Cargo.toml +++ b/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" From 3333b03b38d52b98173740697ebb809a7ac03a74 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 11 Jan 2024 17:17:40 +0100 Subject: [PATCH 5/9] fix: Incorrect zenohd deb dep version --- zenoh-plugin-dds/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zenoh-plugin-dds/Cargo.toml b/zenoh-plugin-dds/Cargo.toml index ecc0eee8..d5bee881 100644 --- a/zenoh-plugin-dds/Cargo.toml +++ b/zenoh-plugin-dds/Cargo.toml @@ -65,4 +65,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 a3a9fa9c91b27645c27bcbcc1723586ad0b6779f Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 11 Jan 2024 17:18:35 +0100 Subject: [PATCH 6/9] chore: Rename Cargo config file --- .cargo/{config => config.toml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cargo/{config => config.toml} (100%) diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml From fe2c0571e0cee84a8ce25a1159bf3b4cedecc619 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 11 Jan 2024 17:19:49 +0100 Subject: [PATCH 7/9] chore: Add missing .git suffix in dep locations --- Cargo.lock | 52 ++++++++++++++++++++++++++-------------------------- Cargo.toml | 16 ++++++++-------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 17249a76..7917aac1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -932,7 +932,7 @@ dependencies = [ [[package]] name = "cyclors" version = "0.2.0" -source = "git+https://github.com/ZettaScaleLabs/cyclors?branch=master#c1be4c46e652e4234bd5c25369f990ad0fc3f386" +source = "git+https://github.com/ZettaScaleLabs/cyclors.git?branch=master#c1be4c46e652e4234bd5c25369f990ad0fc3f386" dependencies = [ "bincode", "bindgen", @@ -4204,7 +4204,7 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-global-executor", "async-std", @@ -4269,7 +4269,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "zenoh-collections", ] @@ -4277,7 +4277,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "log", "serde", @@ -4289,12 +4289,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "flume", "json5", @@ -4313,7 +4313,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-std", "lazy_static", @@ -4323,7 +4323,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4336,7 +4336,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-std", "bincode", @@ -4356,7 +4356,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -4370,7 +4370,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-std", "async-trait", @@ -4389,7 +4389,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-std", "async-trait", @@ -4406,7 +4406,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-rustls", "async-std", @@ -4432,7 +4432,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-std", "async-trait", @@ -4448,7 +4448,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-rustls", "async-std", @@ -4473,7 +4473,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-std", "async-trait", @@ -4492,7 +4492,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-std", "async-trait", @@ -4510,7 +4510,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-std", "async-trait", @@ -4530,7 +4530,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "proc-macro2", "quote", @@ -4572,7 +4572,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-rest" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "anyhow", "async-std", @@ -4600,7 +4600,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "libloading 0.8.0", "log", @@ -4613,7 +4613,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "const_format", "hex", @@ -4629,7 +4629,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "anyhow", ] @@ -4637,7 +4637,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-std", "event-listener 4.0.0", @@ -4652,7 +4652,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-executor", "async-global-executor", @@ -4683,7 +4683,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#780ec606ba4000a17b2da0e2b0b668e11d37c65e" dependencies = [ "async-std", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 18fe3f4e..4787b70a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ async-trait = "0.1.66" bincode = "1.3.3" cdr = "0.2.4" clap = "3.2.23" -cyclors = { version = "0.2.0", git = "https://github.com/ZettaScaleLabs/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" @@ -48,17 +48,17 @@ regex = "1.7.1" rustc_version = "0.4" serde = "1.0.154" serde_json = "1.0.94" -zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh", branch = "master", features = [ +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", branch = "master" } -zenoh-core = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh", branch = "master" } -zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh", branch = "master", features = [ +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", branch = "master", default-features = false } -zenoh-plugin-trait = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh", branch = "master", default-features = false } -zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh", branch = "master", default-features = false } +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 From 8d7441b4b613382fe62d99bc587d7d71f94297cf Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 11 Jan 2024 17:25:05 +0100 Subject: [PATCH 8/9] chore: Rename CI workflow to ci.yml --- .github/workflows/{rust.yml => ci.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{rust.yml => ci.yml} (99%) diff --git a/.github/workflows/rust.yml b/.github/workflows/ci.yml similarity index 99% rename from .github/workflows/rust.yml rename to .github/workflows/ci.yml index 9f26e691..31f8c55e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ # Contributors: # ZettaScale Zenoh Team, # -name: Rust +name: CI on: push: From 849e978ded6976d94cde655e0abd27b060bb4083 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Thu, 11 Jan 2024 17:25:32 +0100 Subject: [PATCH 9/9] fix: Reduce status checks in ci.yml --- .github/workflows/ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31f8c55e..cf42d9e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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")'