From 37f80d9befc757ca091a748e41217b8cd1bdf16c Mon Sep 17 00:00:00 2001 From: OlivierHecart Date: Fri, 22 Sep 2023 15:09:41 +0200 Subject: [PATCH 1/5] Bump version to 0.10.0-rc --- Cargo.lock | 66 +++++++++---------- Cargo.toml | 58 ++++++++-------- plugins/zenoh-plugin-rest/Cargo.toml | 2 +- .../zenoh-plugin-storage-manager/Cargo.toml | 2 +- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e945a9e637..235be093ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4467,7 +4467,7 @@ dependencies = [ [[package]] name = "zenoh" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-global-executor", "async-std", @@ -4514,7 +4514,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "rand 0.8.5", "zenoh-collections", @@ -4522,7 +4522,7 @@ dependencies = [ [[package]] name = "zenoh-codec" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "criterion", "env_logger", @@ -4538,11 +4538,11 @@ dependencies = [ [[package]] name = "zenoh-collections" -version = "0.10.0-dev" +version = "0.10.0-rc" [[package]] name = "zenoh-config" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "flume", "json5", @@ -4559,7 +4559,7 @@ dependencies = [ [[package]] name = "zenoh-core" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "lazy_static", @@ -4568,7 +4568,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4580,7 +4580,7 @@ dependencies = [ [[package]] name = "zenoh-examples" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "clap 3.2.25", @@ -4598,7 +4598,7 @@ dependencies = [ [[package]] name = "zenoh-ext" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "bincode", @@ -4618,7 +4618,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "criterion", "hashbrown 0.14.0", @@ -4633,7 +4633,7 @@ dependencies = [ [[package]] name = "zenoh-link" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "async-trait", @@ -4654,7 +4654,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "async-trait", @@ -4669,7 +4669,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-rustls", "async-std", @@ -4692,7 +4692,7 @@ dependencies = [ [[package]] name = "zenoh-link-serial" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "async-trait", @@ -4713,7 +4713,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "async-trait", @@ -4728,7 +4728,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-rustls", "async-std", @@ -4750,7 +4750,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "async-trait", @@ -4768,7 +4768,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixpipe" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "advisory-lock", "async-io", @@ -4789,7 +4789,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "async-trait", @@ -4806,7 +4806,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "async-trait", @@ -4825,7 +4825,7 @@ dependencies = [ [[package]] name = "zenoh-macros" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "proc-macro2", "quote", @@ -4837,7 +4837,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-example" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "clap 3.2.25", @@ -4854,7 +4854,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-rest" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "anyhow", "async-std", @@ -4881,7 +4881,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-storage-manager" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-global-executor", "async-std", @@ -4914,7 +4914,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "libloading", "log", @@ -4926,7 +4926,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "const_format", "hex", @@ -4942,14 +4942,14 @@ dependencies = [ [[package]] name = "zenoh-result" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "anyhow", ] [[package]] name = "zenoh-shm" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "bincode", "log", @@ -4961,7 +4961,7 @@ dependencies = [ [[package]] name = "zenoh-sync" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "event-listener", @@ -4975,7 +4975,7 @@ dependencies = [ [[package]] name = "zenoh-transport" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-executor", "async-global-executor", @@ -5009,7 +5009,7 @@ dependencies = [ [[package]] name = "zenoh-util" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "async-trait", @@ -5034,7 +5034,7 @@ dependencies = [ [[package]] name = "zenoh_backend_traits" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "async-trait", @@ -5048,7 +5048,7 @@ dependencies = [ [[package]] name = "zenohd" -version = "0.10.0-dev" +version = "0.10.0-rc" dependencies = [ "async-std", "clap 3.2.25", diff --git a/Cargo.toml b/Cargo.toml index bbc55a6c7e..63fe64d866 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ exclude = ["ci/nostd-check"] [workspace.package] rust-version = "1.66.1" -version = "0.10.0-dev" # Zenoh version +version = "0.10.0-rc" # Zenoh version repository = "https://github.com/eclipse-zenoh/zenoh" homepage = "http://zenoh.io" authors = [ @@ -157,34 +157,34 @@ rustls-webpki = "0.101.4" webpki-roots = "0.25" winapi = { version = "0.3.9", features = ["iphlpapi"] } z-serial = "0.2.1" -zenoh-ext = { version = "0.10.0-dev", path = "zenoh-ext" } -zenoh-shm = { version = "0.10.0-dev", path = "commons/zenoh-shm" } -zenoh-result = { version = "0.10.0-dev", path = "commons/zenoh-result", default-features = false } -zenoh-config = { version = "0.10.0-dev", path = "commons/zenoh-config" } -zenoh-protocol = { version = "0.10.0-dev", path = "commons/zenoh-protocol", default-features = false } -zenoh-keyexpr = { version = "0.10.0-dev", path = "commons/zenoh-keyexpr", default-features = false } -zenoh-core = { version = "0.10.0-dev", path = "commons/zenoh-core" } -zenoh-buffers = { version = "0.10.0-dev", path = "commons/zenoh-buffers", default-features = false } -zenoh-util = { version = "0.10.0-dev", path = "commons/zenoh-util" } -zenoh-crypto = { version = "0.10.0-dev", path = "commons/zenoh-crypto" } -zenoh-codec = { version = "0.10.0-dev", path = "commons/zenoh-codec" } -zenoh-sync = { version = "0.10.0-dev", path = "commons/zenoh-sync" } -zenoh-collections = { version = "0.10.0-dev", path = "commons/zenoh-collections", default-features = false } -zenoh-macros = { version = "0.10.0-dev", path = "commons/zenoh-macros" } -zenoh-plugin-trait = { version = "0.10.0-dev", path = "plugins/zenoh-plugin-trait", default-features = false } -zenoh_backend_traits = { version = "0.10.0-dev", path = "plugins/zenoh-backend-traits" } -zenoh-transport = { version = "0.10.0-dev", path = "io/zenoh-transport" } -zenoh-link-tls = { version = "0.10.0-dev", path = "io/zenoh-links/zenoh-link-tls" } -zenoh-link-tcp = { version = "0.10.0-dev", path = "io/zenoh-links/zenoh-link-tcp" } -zenoh-link-unixsock_stream = { version = "0.10.0-dev", path = "io/zenoh-links/zenoh-link-unixsock_stream" } -zenoh-link-quic = { version = "0.10.0-dev", path = "io/zenoh-links/zenoh-link-quic" } -zenoh-link-udp = { version = "0.10.0-dev", path = "io/zenoh-links/zenoh-link-udp" } -zenoh-link-ws = { version = "0.10.0-dev", path = "io/zenoh-links/zenoh-link-ws" } -zenoh-link-unixpipe = { version = "0.10.0-dev", path = "io/zenoh-links/zenoh-link-unixpipe" } -zenoh-link-serial = { version = "0.10.0-dev", path = "io/zenoh-links/zenoh-link-serial" } -zenoh-link = { version = "0.10.0-dev", path = "io/zenoh-link" } -zenoh-link-commons = { version = "0.10.0-dev", path = "io/zenoh-link-commons" } -zenoh = { version = "0.10.0-dev", path = "zenoh" } +zenoh-ext = { version = "0.10.0-rc", path = "zenoh-ext" } +zenoh-shm = { version = "0.10.0-rc", path = "commons/zenoh-shm" } +zenoh-result = { version = "0.10.0-rc", path = "commons/zenoh-result", default-features = false } +zenoh-config = { version = "0.10.0-rc", path = "commons/zenoh-config" } +zenoh-protocol = { version = "0.10.0-rc", path = "commons/zenoh-protocol", default-features = false } +zenoh-keyexpr = { version = "0.10.0-rc", path = "commons/zenoh-keyexpr", default-features = false } +zenoh-core = { version = "0.10.0-rc", path = "commons/zenoh-core" } +zenoh-buffers = { version = "0.10.0-rc", path = "commons/zenoh-buffers", default-features = false } +zenoh-util = { version = "0.10.0-rc", path = "commons/zenoh-util" } +zenoh-crypto = { version = "0.10.0-rc", path = "commons/zenoh-crypto" } +zenoh-codec = { version = "0.10.0-rc", path = "commons/zenoh-codec" } +zenoh-sync = { version = "0.10.0-rc", path = "commons/zenoh-sync" } +zenoh-collections = { version = "0.10.0-rc", path = "commons/zenoh-collections", default-features = false } +zenoh-macros = { version = "0.10.0-rc", path = "commons/zenoh-macros" } +zenoh-plugin-trait = { version = "0.10.0-rc", path = "plugins/zenoh-plugin-trait", default-features = false } +zenoh_backend_traits = { version = "0.10.0-rc", path = "plugins/zenoh-backend-traits" } +zenoh-transport = { version = "0.10.0-rc", path = "io/zenoh-transport" } +zenoh-link-tls = { version = "0.10.0-rc", path = "io/zenoh-links/zenoh-link-tls" } +zenoh-link-tcp = { version = "0.10.0-rc", path = "io/zenoh-links/zenoh-link-tcp" } +zenoh-link-unixsock_stream = { version = "0.10.0-rc", path = "io/zenoh-links/zenoh-link-unixsock_stream" } +zenoh-link-quic = { version = "0.10.0-rc", path = "io/zenoh-links/zenoh-link-quic" } +zenoh-link-udp = { version = "0.10.0-rc", path = "io/zenoh-links/zenoh-link-udp" } +zenoh-link-ws = { version = "0.10.0-rc", path = "io/zenoh-links/zenoh-link-ws" } +zenoh-link-unixpipe = { version = "0.10.0-rc", path = "io/zenoh-links/zenoh-link-unixpipe" } +zenoh-link-serial = { version = "0.10.0-rc", path = "io/zenoh-links/zenoh-link-serial" } +zenoh-link = { version = "0.10.0-rc", path = "io/zenoh-link" } +zenoh-link-commons = { version = "0.10.0-rc", path = "io/zenoh-link-commons" } +zenoh = { version = "0.10.0-rc", path = "zenoh" } [profile.dev] debug = true diff --git a/plugins/zenoh-plugin-rest/Cargo.toml b/plugins/zenoh-plugin-rest/Cargo.toml index f3d10b1618..b8454bd3c5 100644 --- a/plugins/zenoh-plugin-rest/Cargo.toml +++ b/plugins/zenoh-plugin-rest/Cargo.toml @@ -69,4 +69,4 @@ maintainer = "zenoh-dev@eclipse.org" copyright = "2022 ZettaScale Technology" section = "net" license-file = ["../../LICENSE", "0"] -depends = "zenohd (=0.10.0-dev)" +depends = "zenohd (=0.10.0-rc)" diff --git a/plugins/zenoh-plugin-storage-manager/Cargo.toml b/plugins/zenoh-plugin-storage-manager/Cargo.toml index cec56c294f..a68b046a7a 100644 --- a/plugins/zenoh-plugin-storage-manager/Cargo.toml +++ b/plugins/zenoh-plugin-storage-manager/Cargo.toml @@ -73,4 +73,4 @@ maintainer = "zenoh-dev@eclipse.org" copyright = "2022 ZettaScale Technology" section = "net" license-file = ["../../LICENSE", "0"] -depends = "zenohd (=0.10.0-dev)" +depends = "zenohd (=0.10.0-rc)" From f3bd4a6f9ab1519abd2342c67b28e7bcda4871ec Mon Sep 17 00:00:00 2001 From: OlivierHecart Date: Tue, 26 Sep 2023 17:53:36 +0200 Subject: [PATCH 2/5] Publish zenoh-link-unixpipe crate --- .github/workflows/crates_check.sh | 1 + .github/workflows/crates_publish.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/crates_check.sh b/.github/workflows/crates_check.sh index e8ec76cbce..7e9fca4c8c 100755 --- a/.github/workflows/crates_check.sh +++ b/.github/workflows/crates_check.sh @@ -16,6 +16,7 @@ cargo check -p zenoh-link-udp --manifest-path io/zenoh-links/zenoh-link-udp/Carg cargo check -p zenoh-link-tcp --manifest-path io/zenoh-links/zenoh-link-tcp/Cargo.toml && cargo check -p zenoh-link-tls --manifest-path io/zenoh-links/zenoh-link-tls/Cargo.toml && cargo check -p zenoh-link-quic --manifest-path io/zenoh-links/zenoh-link-quic/Cargo.toml && +cargo check -p zenoh-link-unixpipe --manifest-path io/zenoh-links/zenoh-link-unixpipe/Cargo.toml && cargo check -p zenoh-link-unixsock_stream --manifest-path io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml && cargo check -p zenoh-link-serial --manifest-path io/zenoh-links/zenoh-link-serial/Cargo.toml && cargo check -p zenoh-link-ws --manifest-path io/zenoh-links/zenoh-link-ws/Cargo.toml && diff --git a/.github/workflows/crates_publish.sh b/.github/workflows/crates_publish.sh index 4e8b93b856..64fd5df50a 100755 --- a/.github/workflows/crates_publish.sh +++ b/.github/workflows/crates_publish.sh @@ -17,6 +17,7 @@ cargo login $1 (cd io/zenoh-links/zenoh-link-tcp && cargo publish) (cd io/zenoh-links/zenoh-link-tls && cargo publish) (cd io/zenoh-links/zenoh-link-quic && cargo publish) +(cd io/zenoh-links/zenoh-link-unixpipe && cargo publish) (cd io/zenoh-links/zenoh-link-unixsock_stream && cargo publish) (cd io/zenoh-links/zenoh-link-serial && cargo publish) (cd io/zenoh-links/zenoh-link-ws && cargo publish) From e7563e147506076479981869e3709198b7a615c6 Mon Sep 17 00:00:00 2001 From: OlivierHecart Date: Tue, 26 Sep 2023 18:02:42 +0200 Subject: [PATCH 3/5] Don't stop on cargo publish failure --- .github/workflows/crates_publish.sh | 3 ++- .github/workflows/release.yml | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/crates_publish.sh b/.github/workflows/crates_publish.sh index 64fd5df50a..c2080ae75e 100755 --- a/.github/workflows/crates_publish.sh +++ b/.github/workflows/crates_publish.sh @@ -29,4 +29,5 @@ cargo login $1 (cd zenohd && cargo publish) (cd plugins/zenoh-plugin-rest && cargo publish) (cd plugins/zenoh-backend-traits && cargo publish) -(cd plugins/zenoh-plugin-storage-manager && cargo publish) \ No newline at end of file +(cd plugins/zenoh-plugin-storage-manager && cargo publish) +echo Done \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b3a767ceb..ff5b7519c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -373,7 +373,9 @@ jobs: run: .github/workflows/crates_check.sh - name: Publish to crates.io shell: bash - run: .github/workflows/crates_publish.sh ${{ secrets.CRATES_IO_TOKEN }} + run: | + set +x + .github/workflows/crates_publish.sh ${{ secrets.CRATES_IO_TOKEN }} - name: Cancel workflow if fail # thus Docker job be interrupted if: failure() uses: andymckay/cancel-action@0.2 From 8cde87835f4b46ed240d554534e0f5df227e143a Mon Sep 17 00:00:00 2001 From: OlivierHecart Date: Tue, 26 Sep 2023 18:12:49 +0200 Subject: [PATCH 4/5] Allow publication on non tagged commit --- .github/workflows/release.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff5b7519c9..a0cd1c466c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,6 +23,18 @@ on: runtests: description: "run tests" type: boolean + publish: + description: "publish" + type: boolean + githubrelease: + description: "publish as github release" + type: boolean + eclipse: + description: "publish to download.eclipse.org/zenoh" + type: boolean + cratesio: + description: "publish to crates.io" + type: boolean dockerhub: description: "publish to dockerhub" type: boolean @@ -330,7 +342,7 @@ jobs: publication: name: Release publication - if: ${{ needs.checks.outputs.IS_RELEASE == 'true' && !failure() }} + if: ${{ (needs.checks.outputs.IS_RELEASE == 'true' || github.event.inputs.publish == 'true') && !failure() }} needs: [checks, builds, tests, doc] runs-on: ubuntu-latest steps: @@ -339,10 +351,12 @@ jobs: with: path: ARTIFACTS - name: Publish as github release + if: ${{ !(github.event.inputs.githubrelease == 'false') }} uses: softprops/action-gh-release@v1 with: files: ARTIFACTS/*/*.* - name: Publish to download.eclipse.org/zenoh + if: ${{ !(github.event.inputs.eclipse == 'false') }} env: SSH_TARGET: genie.zenoh@projects-storage.eclipse.org ECLIPSE_BASE_DIR: /home/data/httpd/download.eclipse.org/zenoh @@ -367,11 +381,14 @@ jobs: ssh-add -D - uses: actions/checkout@v2 - name: Install Rust toolchain + if: ${{ !(github.event.inputs.cratesio == 'false') }} run: rustup show - name: Check crates + if: ${{ !(github.event.inputs.cratesio == 'false') }} shell: bash run: .github/workflows/crates_check.sh - name: Publish to crates.io + if: ${{ !(github.event.inputs.cratesio == 'false') }} shell: bash run: | set +x From 6ae4a205db5b908bc0f45138e74ffa54fd31f800 Mon Sep 17 00:00:00 2001 From: yellowhatter Date: Wed, 27 Sep 2023 11:58:30 +0400 Subject: [PATCH 5/5] fix zenoh-link-unixpipe crate check --- io/zenoh-links/zenoh-link-unixpipe/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml b/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml index 112e9705a6..c1d56998a5 100644 --- a/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml +++ b/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml @@ -32,7 +32,7 @@ async-std = { workspace = true } async-trait = { workspace = true } async-io = ">= 1.13.0" log = { workspace = true } -rand = { workspace = true } +rand = { workspace = true, default-features = true } zenoh-buffers = { workspace = true } zenoh-core = { workspace = true } zenoh-config = { workspace = true }