From eb75d32005c5d97f11981d1a86fbe6acf861256f Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Tue, 14 May 2024 12:31:03 +0200 Subject: [PATCH 01/33] feat: Check MSRV --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6320464db3..d698860bb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,6 +74,11 @@ jobs: - name: Check licenses run: cargo deny check licenses + - name: Check MSRV + uses: ZettaScaleLabs/ci/check-msrv@develop + with: + repo: ${{ github.repository }} + test: name: Unit tests on ${{ matrix.os }} runs-on: ${{ matrix.os }} From 1ae1a741e657ed32a4012d8898b7819ce0252c6c Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Tue, 14 May 2024 12:43:36 +0200 Subject: [PATCH 02/33] chore: Force-trigger CI From b03582bc41a3dd8ade0b79393412183c0841bba7 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Tue, 14 May 2024 13:09:13 +0200 Subject: [PATCH 03/33] chore: Move MSRV check before Clippy lints --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d698860bb8..378a6a784d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,11 @@ jobs: - name: Install latest cargo-deny uses: taiki-e/install-action@cargo-deny + - name: Check MSRV + uses: ZettaScaleLabs/ci/check-msrv@develop + with: + repo: ${{ github.repository }} + - name: Code format check run: cargo fmt --check @@ -74,11 +79,6 @@ jobs: - name: Check licenses run: cargo deny check licenses - - name: Check MSRV - uses: ZettaScaleLabs/ci/check-msrv@develop - with: - repo: ${{ github.repository }} - test: name: Unit tests on ${{ matrix.os }} runs-on: ${{ matrix.os }} From 26ca5c2dd245f4dbb2c0398ee19de646b748925b Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Tue, 14 May 2024 13:19:15 +0200 Subject: [PATCH 04/33] core: Re-trigger CI From 4640d389b2c8cb088333cefd1f85f8adaba4cd9b Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Tue, 14 May 2024 13:24:34 +0200 Subject: [PATCH 05/33] core: Re-trigger CI From 8d8283326c0389752cb438793c10cfa23a515f3d Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Fri, 24 May 2024 15:43:36 +0200 Subject: [PATCH 06/33] chore: Force-trigger CI From 1eb20c0d6000b8fd1f42a720a3e4d50ad2d07af8 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Fri, 24 May 2024 18:16:51 +0200 Subject: [PATCH 07/33] chore: Force-trigger CI From 25bbe358d320d2ed156ce24a83f10072849637e9 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 27 May 2024 10:03:10 +0200 Subject: [PATCH 08/33] chore: Force-trigger CI From 01eb2599563c9c8804044742ad08710c9f1455c5 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 27 May 2024 12:50:52 +0200 Subject: [PATCH 09/33] fix: Don't use `workspace.package.rust-version` --- commons/zenoh-buffers/Cargo.toml | 2 +- commons/zenoh-codec/Cargo.toml | 2 +- commons/zenoh-collections/Cargo.toml | 2 +- commons/zenoh-config/Cargo.toml | 2 +- commons/zenoh-core/Cargo.toml | 2 +- commons/zenoh-crypto/Cargo.toml | 2 +- commons/zenoh-keyexpr/Cargo.toml | 2 +- commons/zenoh-macros/Cargo.toml | 2 +- commons/zenoh-protocol/Cargo.toml | 2 +- commons/zenoh-result/Cargo.toml | 2 +- commons/zenoh-runtime/Cargo.toml | 2 +- commons/zenoh-shm/Cargo.toml | 2 +- commons/zenoh-sync/Cargo.toml | 2 +- commons/zenoh-task/Cargo.toml | 2 +- commons/zenoh-util/Cargo.toml | 2 +- examples/Cargo.toml | 2 +- io/zenoh-link-commons/Cargo.toml | 2 +- io/zenoh-link/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-quic/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-serial/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-tcp/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-tls/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-udp/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-unixpipe/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-vsock/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-ws/Cargo.toml | 2 +- io/zenoh-transport/Cargo.toml | 2 +- plugins/zenoh-backend-example/Cargo.toml | 2 +- plugins/zenoh-backend-traits/Cargo.toml | 2 +- plugins/zenoh-plugin-example/Cargo.toml | 2 +- plugins/zenoh-plugin-rest/Cargo.toml | 2 +- plugins/zenoh-plugin-storage-manager/Cargo.toml | 2 +- plugins/zenoh-plugin-trait/Cargo.toml | 2 +- zenoh-ext/Cargo.toml | 2 +- zenoh-ext/examples/Cargo.toml | 2 +- zenoh/Cargo.toml | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/commons/zenoh-buffers/Cargo.toml b/commons/zenoh-buffers/Cargo.toml index b7a7c87634..71883bfe32 100644 --- a/commons/zenoh-buffers/Cargo.toml +++ b/commons/zenoh-buffers/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-buffers" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-codec/Cargo.toml b/commons/zenoh-codec/Cargo.toml index 6258213743..3a3bbe2d66 100644 --- a/commons/zenoh-codec/Cargo.toml +++ b/commons/zenoh-codec/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-codec" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-collections/Cargo.toml b/commons/zenoh-collections/Cargo.toml index ca01d7460e..1cc0c101ef 100644 --- a/commons/zenoh-collections/Cargo.toml +++ b/commons/zenoh-collections/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-collections" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-config/Cargo.toml b/commons/zenoh-config/Cargo.toml index cb502881d9..d8aed9ea85 100644 --- a/commons/zenoh-config/Cargo.toml +++ b/commons/zenoh-config/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-config" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-core/Cargo.toml b/commons/zenoh-core/Cargo.toml index 7890646d1b..7068c11e56 100644 --- a/commons/zenoh-core/Cargo.toml +++ b/commons/zenoh-core/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-core" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-crypto/Cargo.toml b/commons/zenoh-crypto/Cargo.toml index 66942094e0..6abaa13f43 100644 --- a/commons/zenoh-crypto/Cargo.toml +++ b/commons/zenoh-crypto/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-crypto" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-keyexpr/Cargo.toml b/commons/zenoh-keyexpr/Cargo.toml index 41456af1ec..258082c9a7 100644 --- a/commons/zenoh-keyexpr/Cargo.toml +++ b/commons/zenoh-keyexpr/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-keyexpr" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-macros/Cargo.toml b/commons/zenoh-macros/Cargo.toml index 7d06482e48..24cb427882 100644 --- a/commons/zenoh-macros/Cargo.toml +++ b/commons/zenoh-macros/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-macros" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-protocol/Cargo.toml b/commons/zenoh-protocol/Cargo.toml index 93c92ee33f..af37d0e0fb 100644 --- a/commons/zenoh-protocol/Cargo.toml +++ b/commons/zenoh-protocol/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-protocol" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-result/Cargo.toml b/commons/zenoh-result/Cargo.toml index 623185e53e..363da099a0 100644 --- a/commons/zenoh-result/Cargo.toml +++ b/commons/zenoh-result/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-result" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-runtime/Cargo.toml b/commons/zenoh-runtime/Cargo.toml index e3f0c7a3c0..0ffb3b83e2 100644 --- a/commons/zenoh-runtime/Cargo.toml +++ b/commons/zenoh-runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zenoh-runtime" -rust-version = { workspace = true } +rust-version = "1.66.1" version = { workspace = true } repository = { workspace = true } homepage = { workspace = true } diff --git a/commons/zenoh-shm/Cargo.toml b/commons/zenoh-shm/Cargo.toml index e6107b9a13..d9e6f566e0 100644 --- a/commons/zenoh-shm/Cargo.toml +++ b/commons/zenoh-shm/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-shm" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-sync/Cargo.toml b/commons/zenoh-sync/Cargo.toml index 01e8e935fd..f127395cdd 100644 --- a/commons/zenoh-sync/Cargo.toml +++ b/commons/zenoh-sync/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-sync" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-task/Cargo.toml b/commons/zenoh-task/Cargo.toml index a9f5ab07c1..25405b8268 100644 --- a/commons/zenoh-task/Cargo.toml +++ b/commons/zenoh-task/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-task" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-util/Cargo.toml b/commons/zenoh-util/Cargo.toml index 48bbb17d04..91dd22717e 100644 --- a/commons/zenoh-util/Cargo.toml +++ b/commons/zenoh-util/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-util" version = { workspace = true } repository = { workspace = true } diff --git a/examples/Cargo.toml b/examples/Cargo.toml index b08ace3cbc..7d39a5295b 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-examples" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-link-commons/Cargo.toml b/io/zenoh-link-commons/Cargo.toml index 12b70cad6d..52f65cd5ea 100644 --- a/io/zenoh-link-commons/Cargo.toml +++ b/io/zenoh-link-commons/Cargo.toml @@ -20,7 +20,7 @@ homepage = { workspace = true } license = { workspace = true } name = "zenoh-link-commons" repository = { workspace = true } -rust-version = { workspace = true } +rust-version = "1.66.1" version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/io/zenoh-link/Cargo.toml b/io/zenoh-link/Cargo.toml index 7a9772391f..1eb8146f16 100644 --- a/io/zenoh-link/Cargo.toml +++ b/io/zenoh-link/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-link" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-quic/Cargo.toml b/io/zenoh-links/zenoh-link-quic/Cargo.toml index 0e1c720d78..2548b525ee 100644 --- a/io/zenoh-links/zenoh-link-quic/Cargo.toml +++ b/io/zenoh-links/zenoh-link-quic/Cargo.toml @@ -20,7 +20,7 @@ homepage = { workspace = true } license = { workspace = true } name = "zenoh-link-quic" repository = { workspace = true } -rust-version = { workspace = true } +rust-version = "1.66.1" version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/io/zenoh-links/zenoh-link-serial/Cargo.toml b/io/zenoh-links/zenoh-link-serial/Cargo.toml index d89e1a0e78..3f8190a744 100644 --- a/io/zenoh-links/zenoh-link-serial/Cargo.toml +++ b/io/zenoh-links/zenoh-link-serial/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-link-serial" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-tcp/Cargo.toml b/io/zenoh-links/zenoh-link-tcp/Cargo.toml index ca94412382..ba502c9a52 100644 --- a/io/zenoh-links/zenoh-link-tcp/Cargo.toml +++ b/io/zenoh-links/zenoh-link-tcp/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-link-tcp" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-tls/Cargo.toml b/io/zenoh-links/zenoh-link-tls/Cargo.toml index 91fb72787e..d4f63ebac3 100644 --- a/io/zenoh-links/zenoh-link-tls/Cargo.toml +++ b/io/zenoh-links/zenoh-link-tls/Cargo.toml @@ -20,7 +20,7 @@ homepage = { workspace = true } license = { workspace = true } name = "zenoh-link-tls" repository = { workspace = true } -rust-version = { workspace = true } +rust-version = "1.66.1" version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/io/zenoh-links/zenoh-link-udp/Cargo.toml b/io/zenoh-links/zenoh-link-udp/Cargo.toml index f1bc3365f1..10684628b8 100644 --- a/io/zenoh-links/zenoh-link-udp/Cargo.toml +++ b/io/zenoh-links/zenoh-link-udp/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-link-udp" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml b/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml index 22ff335d25..6bf02dd57a 100644 --- a/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml +++ b/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-link-unixpipe" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml b/io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml index b915767a19..260e48ee87 100644 --- a/io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml +++ b/io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-link-unixsock_stream" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-vsock/Cargo.toml b/io/zenoh-links/zenoh-link-vsock/Cargo.toml index 4bf709b8c2..106456bc77 100644 --- a/io/zenoh-links/zenoh-link-vsock/Cargo.toml +++ b/io/zenoh-links/zenoh-link-vsock/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-link-vsock" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-ws/Cargo.toml b/io/zenoh-links/zenoh-link-ws/Cargo.toml index 63d78a5cb5..0a7657f743 100644 --- a/io/zenoh-links/zenoh-link-ws/Cargo.toml +++ b/io/zenoh-links/zenoh-link-ws/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-link-ws" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-transport/Cargo.toml b/io/zenoh-transport/Cargo.toml index 9f6594761e..decdcd060d 100644 --- a/io/zenoh-transport/Cargo.toml +++ b/io/zenoh-transport/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-transport" version = { workspace = true } repository = { workspace = true } diff --git a/plugins/zenoh-backend-example/Cargo.toml b/plugins/zenoh-backend-example/Cargo.toml index 5ca4d3096b..d5b3010aea 100644 --- a/plugins/zenoh-backend-example/Cargo.toml +++ b/plugins/zenoh-backend-example/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-backend-example" version = { workspace = true } authors = { workspace = true } diff --git a/plugins/zenoh-backend-traits/Cargo.toml b/plugins/zenoh-backend-traits/Cargo.toml index f2b8a4a1eb..c109424fab 100644 --- a/plugins/zenoh-backend-traits/Cargo.toml +++ b/plugins/zenoh-backend-traits/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh_backend_traits" version = { workspace = true } repository = { workspace = true } diff --git a/plugins/zenoh-plugin-example/Cargo.toml b/plugins/zenoh-plugin-example/Cargo.toml index 7cb0ad66f6..be79c9b262 100644 --- a/plugins/zenoh-plugin-example/Cargo.toml +++ b/plugins/zenoh-plugin-example/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-plugin-example" version = { workspace = true } authors = { workspace = true } diff --git a/plugins/zenoh-plugin-rest/Cargo.toml b/plugins/zenoh-plugin-rest/Cargo.toml index 989bd1b86d..34ede35cd3 100644 --- a/plugins/zenoh-plugin-rest/Cargo.toml +++ b/plugins/zenoh-plugin-rest/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-plugin-rest" version = { workspace = true } repository = { workspace = true } diff --git a/plugins/zenoh-plugin-storage-manager/Cargo.toml b/plugins/zenoh-plugin-storage-manager/Cargo.toml index 058722965f..97969fd4e3 100644 --- a/plugins/zenoh-plugin-storage-manager/Cargo.toml +++ b/plugins/zenoh-plugin-storage-manager/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-plugin-storage-manager" version = { workspace = true } repository = { workspace = true } diff --git a/plugins/zenoh-plugin-trait/Cargo.toml b/plugins/zenoh-plugin-trait/Cargo.toml index f78967fe3d..ec79445182 100644 --- a/plugins/zenoh-plugin-trait/Cargo.toml +++ b/plugins/zenoh-plugin-trait/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-plugin-trait" version = { workspace = true } repository = { workspace = true } diff --git a/zenoh-ext/Cargo.toml b/zenoh-ext/Cargo.toml index 3b842244d3..88b2b17991 100644 --- a/zenoh-ext/Cargo.toml +++ b/zenoh-ext/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-ext" version = { workspace = true } repository = { workspace = true } diff --git a/zenoh-ext/examples/Cargo.toml b/zenoh-ext/examples/Cargo.toml index 9cca8848ff..c9a7912554 100644 --- a/zenoh-ext/examples/Cargo.toml +++ b/zenoh-ext/examples/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh-ext-examples" version = { workspace = true } repository = { workspace = true } diff --git a/zenoh/Cargo.toml b/zenoh/Cargo.toml index a8bf041c11..a4120d7449 100644 --- a/zenoh/Cargo.toml +++ b/zenoh/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.66.1" name = "zenoh" version = { workspace = true } repository = { workspace = true } From fccc773a2df0364395d7455a4ad13015be811c61 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 27 May 2024 12:53:15 +0200 Subject: [PATCH 10/33] chore: Force-trigger CI From 9aa9bfa51a791b780f429011c7cb222d16e44fbf Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 27 May 2024 13:00:32 +0200 Subject: [PATCH 11/33] chore: Force-trigger CI From 30e835f6237f49ba40249ae44d6659ab58349c3e Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 27 May 2024 13:03:39 +0200 Subject: [PATCH 12/33] chore: Force-trigger CI From 4990103c967be60620b73a33fa3c12becf37b8a1 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 27 May 2024 13:24:01 +0200 Subject: [PATCH 13/33] chore: Force-trigger CI From 182b53ad6956a62d40e374b02dfe2caad62ea6b4 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 27 May 2024 14:39:39 +0200 Subject: [PATCH 14/33] fix: Move check into its own job --- .github/workflows/ci.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 378a6a784d..c65c5e14d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,11 +48,6 @@ jobs: - name: Install latest cargo-deny uses: taiki-e/install-action@cargo-deny - - name: Check MSRV - uses: ZettaScaleLabs/ci/check-msrv@develop - with: - repo: ${{ github.repository }} - - name: Code format check run: cargo fmt --check @@ -142,12 +137,23 @@ jobs: name: Typos Check runs-on: ubuntu-latest steps: - - name: Clone this repository + - name: Clone this repository uses: actions/checkout@v4 - name: Check spelling uses: crate-ci/typos@master + msrvs: + name: Check crate MSRVs + runs-on: ubuntu-latest + steps: + - name: Clone this repository + uses: actions/checkout@v4 + + - uses: ZettaScaleLabs/ci/check-msrv@develop + with: + repo: ${{ github.repository }} + # 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 From 49906c5944a6f188230d794e875afe32b68b74b5 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 27 May 2024 14:43:27 +0200 Subject: [PATCH 15/33] fix: Set minimum checked MSRV to 1.68 --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c65c5e14d8..828945bd9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -153,6 +153,9 @@ jobs: - uses: ZettaScaleLabs/ci/check-msrv@develop with: repo: ${{ github.repository }} + # NOTE: As of commit 25f06bd, the minimum MSRV found in the workspace is 1.68. + # This value should be as low as possible to avoid needlessly checking older versions. + min: 1.68 # NOTE: In GitHub repository settings, the "Require status checks to pass # before merging" branch protection rule ensures that commits are only merged From 798b3bddb2174204a3a1f9ac38be39c51808b3c0 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 27 May 2024 14:44:36 +0200 Subject: [PATCH 16/33] fix: Specify `min` version's patch number --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 828945bd9f..c6b729f2f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -155,7 +155,7 @@ jobs: repo: ${{ github.repository }} # NOTE: As of commit 25f06bd, the minimum MSRV found in the workspace is 1.68. # This value should be as low as possible to avoid needlessly checking older versions. - min: 1.68 + min: 1.68.0 # NOTE: In GitHub repository settings, the "Require status checks to pass # before merging" branch protection rule ensures that commits are only merged From bb2e969cfdd0c0bf965acce31fbb4836bea91375 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 27 May 2024 14:45:30 +0200 Subject: [PATCH 17/33] style: Rename msrvs job to start with noun --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6b729f2f3..dc6422c3ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -144,7 +144,7 @@ jobs: uses: crate-ci/typos@master msrvs: - name: Check crate MSRVs + name: MSRV checks runs-on: ubuntu-latest steps: - name: Clone this repository From 586ee70d924c8efdcddc85cbaf2a6b942b989fbf Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 27 May 2024 15:03:09 +0200 Subject: [PATCH 18/33] fix: Incorrect crate MSRVs --- commons/zenoh-buffers/Cargo.toml | 2 +- commons/zenoh-codec/Cargo.toml | 2 +- commons/zenoh-collections/Cargo.toml | 2 +- commons/zenoh-core/Cargo.toml | 2 +- commons/zenoh-crypto/Cargo.toml | 2 +- commons/zenoh-macros/Cargo.toml | 2 +- commons/zenoh-result/Cargo.toml | 2 +- commons/zenoh-shm/Cargo.toml | 2 +- commons/zenoh-sync/Cargo.toml | 2 +- commons/zenoh-task/Cargo.toml | 2 +- commons/zenoh-util/Cargo.toml | 2 +- examples/Cargo.toml | 2 +- io/zenoh-link-commons/Cargo.toml | 2 +- io/zenoh-link/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-quic/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-serial/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-tcp/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-tls/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-udp/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-unixpipe/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-vsock/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-ws/Cargo.toml | 2 +- io/zenoh-transport/Cargo.toml | 2 +- plugins/zenoh-backend-example/Cargo.toml | 2 +- plugins/zenoh-backend-traits/Cargo.toml | 2 +- plugins/zenoh-plugin-example/Cargo.toml | 2 +- plugins/zenoh-plugin-rest/Cargo.toml | 2 +- plugins/zenoh-plugin-storage-manager/Cargo.toml | 2 +- plugins/zenoh-plugin-trait/Cargo.toml | 2 +- zenoh-ext/Cargo.toml | 2 +- zenoh/Cargo.toml | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/commons/zenoh-buffers/Cargo.toml b/commons/zenoh-buffers/Cargo.toml index 71883bfe32..90b50b65d0 100644 --- a/commons/zenoh-buffers/Cargo.toml +++ b/commons/zenoh-buffers/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.68.0" name = "zenoh-buffers" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-codec/Cargo.toml b/commons/zenoh-codec/Cargo.toml index 3a3bbe2d66..4488b9f88f 100644 --- a/commons/zenoh-codec/Cargo.toml +++ b/commons/zenoh-codec/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.68.0" name = "zenoh-codec" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-collections/Cargo.toml b/commons/zenoh-collections/Cargo.toml index 1cc0c101ef..343a643f14 100644 --- a/commons/zenoh-collections/Cargo.toml +++ b/commons/zenoh-collections/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.68.0" name = "zenoh-collections" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-core/Cargo.toml b/commons/zenoh-core/Cargo.toml index 7068c11e56..e338e826f7 100644 --- a/commons/zenoh-core/Cargo.toml +++ b/commons/zenoh-core/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-core" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-crypto/Cargo.toml b/commons/zenoh-crypto/Cargo.toml index 6abaa13f43..26fb7e4f28 100644 --- a/commons/zenoh-crypto/Cargo.toml +++ b/commons/zenoh-crypto/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.68.0" name = "zenoh-crypto" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-macros/Cargo.toml b/commons/zenoh-macros/Cargo.toml index 24cb427882..b69629d804 100644 --- a/commons/zenoh-macros/Cargo.toml +++ b/commons/zenoh-macros/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-macros" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-result/Cargo.toml b/commons/zenoh-result/Cargo.toml index 363da099a0..6909f073a1 100644 --- a/commons/zenoh-result/Cargo.toml +++ b/commons/zenoh-result/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.68.0" name = "zenoh-result" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-shm/Cargo.toml b/commons/zenoh-shm/Cargo.toml index d9e6f566e0..da53a216ce 100644 --- a/commons/zenoh-shm/Cargo.toml +++ b/commons/zenoh-shm/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.68.0" name = "zenoh-shm" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-sync/Cargo.toml b/commons/zenoh-sync/Cargo.toml index f127395cdd..2e949dccd4 100644 --- a/commons/zenoh-sync/Cargo.toml +++ b/commons/zenoh-sync/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-sync" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-task/Cargo.toml b/commons/zenoh-task/Cargo.toml index 25405b8268..79b9cbda0e 100644 --- a/commons/zenoh-task/Cargo.toml +++ b/commons/zenoh-task/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-task" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-util/Cargo.toml b/commons/zenoh-util/Cargo.toml index 91dd22717e..a643292b19 100644 --- a/commons/zenoh-util/Cargo.toml +++ b/commons/zenoh-util/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-util" version = { workspace = true } repository = { workspace = true } diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 7d39a5295b..23a0846d38 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-examples" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-link-commons/Cargo.toml b/io/zenoh-link-commons/Cargo.toml index 52f65cd5ea..95d9408b85 100644 --- a/io/zenoh-link-commons/Cargo.toml +++ b/io/zenoh-link-commons/Cargo.toml @@ -12,6 +12,7 @@ # ZettaScale Zenoh Team, # [package] +rust-version = "1.70.0" authors = { workspace = true } categories = { workspace = true } description = "Internal crate for zenoh." @@ -20,7 +21,6 @@ homepage = { workspace = true } license = { workspace = true } name = "zenoh-link-commons" repository = { workspace = true } -rust-version = "1.66.1" version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/io/zenoh-link/Cargo.toml b/io/zenoh-link/Cargo.toml index 1eb8146f16..dff582a112 100644 --- a/io/zenoh-link/Cargo.toml +++ b/io/zenoh-link/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-link" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-quic/Cargo.toml b/io/zenoh-links/zenoh-link-quic/Cargo.toml index 2548b525ee..fc1f959966 100644 --- a/io/zenoh-links/zenoh-link-quic/Cargo.toml +++ b/io/zenoh-links/zenoh-link-quic/Cargo.toml @@ -12,6 +12,7 @@ # ZettaScale Zenoh Team, # [package] +rust-version = "1.70.0" authors = { workspace = true } categories = { workspace = true } description = "Internal crate for zenoh." @@ -20,7 +21,6 @@ homepage = { workspace = true } license = { workspace = true } name = "zenoh-link-quic" repository = { workspace = true } -rust-version = "1.66.1" version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/io/zenoh-links/zenoh-link-serial/Cargo.toml b/io/zenoh-links/zenoh-link-serial/Cargo.toml index 3f8190a744..ae18010c2d 100644 --- a/io/zenoh-links/zenoh-link-serial/Cargo.toml +++ b/io/zenoh-links/zenoh-link-serial/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-link-serial" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-tcp/Cargo.toml b/io/zenoh-links/zenoh-link-tcp/Cargo.toml index ba502c9a52..c010fdeeac 100644 --- a/io/zenoh-links/zenoh-link-tcp/Cargo.toml +++ b/io/zenoh-links/zenoh-link-tcp/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-link-tcp" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-tls/Cargo.toml b/io/zenoh-links/zenoh-link-tls/Cargo.toml index d4f63ebac3..f458f17ebe 100644 --- a/io/zenoh-links/zenoh-link-tls/Cargo.toml +++ b/io/zenoh-links/zenoh-link-tls/Cargo.toml @@ -12,6 +12,7 @@ # ZettaScale Zenoh Team, # [package] +rust-version = "1.70.0" authors = { workspace = true } categories = { workspace = true } description = "Internal crate for zenoh." @@ -20,7 +21,6 @@ homepage = { workspace = true } license = { workspace = true } name = "zenoh-link-tls" repository = { workspace = true } -rust-version = "1.66.1" version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/io/zenoh-links/zenoh-link-udp/Cargo.toml b/io/zenoh-links/zenoh-link-udp/Cargo.toml index 10684628b8..a01af595c9 100644 --- a/io/zenoh-links/zenoh-link-udp/Cargo.toml +++ b/io/zenoh-links/zenoh-link-udp/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-link-udp" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml b/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml index 6bf02dd57a..e0f77dae88 100644 --- a/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml +++ b/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-link-unixpipe" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml b/io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml index 260e48ee87..be32326db4 100644 --- a/io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml +++ b/io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-link-unixsock_stream" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-vsock/Cargo.toml b/io/zenoh-links/zenoh-link-vsock/Cargo.toml index 106456bc77..9c41c938b9 100644 --- a/io/zenoh-links/zenoh-link-vsock/Cargo.toml +++ b/io/zenoh-links/zenoh-link-vsock/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-link-vsock" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-ws/Cargo.toml b/io/zenoh-links/zenoh-link-ws/Cargo.toml index 0a7657f743..559c58378b 100644 --- a/io/zenoh-links/zenoh-link-ws/Cargo.toml +++ b/io/zenoh-links/zenoh-link-ws/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-link-ws" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-transport/Cargo.toml b/io/zenoh-transport/Cargo.toml index decdcd060d..0adba06e80 100644 --- a/io/zenoh-transport/Cargo.toml +++ b/io/zenoh-transport/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-transport" version = { workspace = true } repository = { workspace = true } diff --git a/plugins/zenoh-backend-example/Cargo.toml b/plugins/zenoh-backend-example/Cargo.toml index d5b3010aea..0e5c68525d 100644 --- a/plugins/zenoh-backend-example/Cargo.toml +++ b/plugins/zenoh-backend-example/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-backend-example" version = { workspace = true } authors = { workspace = true } diff --git a/plugins/zenoh-backend-traits/Cargo.toml b/plugins/zenoh-backend-traits/Cargo.toml index c109424fab..5e7d361fe0 100644 --- a/plugins/zenoh-backend-traits/Cargo.toml +++ b/plugins/zenoh-backend-traits/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh_backend_traits" version = { workspace = true } repository = { workspace = true } diff --git a/plugins/zenoh-plugin-example/Cargo.toml b/plugins/zenoh-plugin-example/Cargo.toml index be79c9b262..e8dc81fcb6 100644 --- a/plugins/zenoh-plugin-example/Cargo.toml +++ b/plugins/zenoh-plugin-example/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-plugin-example" version = { workspace = true } authors = { workspace = true } diff --git a/plugins/zenoh-plugin-rest/Cargo.toml b/plugins/zenoh-plugin-rest/Cargo.toml index 34ede35cd3..eeaa0e0328 100644 --- a/plugins/zenoh-plugin-rest/Cargo.toml +++ b/plugins/zenoh-plugin-rest/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-plugin-rest" version = { workspace = true } repository = { workspace = true } diff --git a/plugins/zenoh-plugin-storage-manager/Cargo.toml b/plugins/zenoh-plugin-storage-manager/Cargo.toml index 97969fd4e3..7152634c82 100644 --- a/plugins/zenoh-plugin-storage-manager/Cargo.toml +++ b/plugins/zenoh-plugin-storage-manager/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-plugin-storage-manager" version = { workspace = true } repository = { workspace = true } diff --git a/plugins/zenoh-plugin-trait/Cargo.toml b/plugins/zenoh-plugin-trait/Cargo.toml index ec79445182..41d3388946 100644 --- a/plugins/zenoh-plugin-trait/Cargo.toml +++ b/plugins/zenoh-plugin-trait/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-plugin-trait" version = { workspace = true } repository = { workspace = true } diff --git a/zenoh-ext/Cargo.toml b/zenoh-ext/Cargo.toml index 88b2b17991..7b849c7717 100644 --- a/zenoh-ext/Cargo.toml +++ b/zenoh-ext/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-ext" version = { workspace = true } repository = { workspace = true } diff --git a/zenoh/Cargo.toml b/zenoh/Cargo.toml index a4120d7449..1c7d947d31 100644 --- a/zenoh/Cargo.toml +++ b/zenoh/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh" version = { workspace = true } repository = { workspace = true } From fe7244be4e98a17cc53cdf0c9141da2f0999e01e Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 27 May 2024 15:28:46 +0200 Subject: [PATCH 19/33] fix: More incorrect MSRVs --- commons/zenoh-config/Cargo.toml | 2 +- commons/zenoh-keyexpr/Cargo.toml | 2 +- commons/zenoh-protocol/Cargo.toml | 2 +- commons/zenoh-runtime/Cargo.toml | 2 +- zenoh-ext/examples/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/commons/zenoh-config/Cargo.toml b/commons/zenoh-config/Cargo.toml index d8aed9ea85..60b76fe274 100644 --- a/commons/zenoh-config/Cargo.toml +++ b/commons/zenoh-config/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-config" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-keyexpr/Cargo.toml b/commons/zenoh-keyexpr/Cargo.toml index 258082c9a7..c85e70d4bf 100644 --- a/commons/zenoh-keyexpr/Cargo.toml +++ b/commons/zenoh-keyexpr/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.68.0" name = "zenoh-keyexpr" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-protocol/Cargo.toml b/commons/zenoh-protocol/Cargo.toml index af37d0e0fb..4ef9d73881 100644 --- a/commons/zenoh-protocol/Cargo.toml +++ b/commons/zenoh-protocol/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.68.0" name = "zenoh-protocol" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-runtime/Cargo.toml b/commons/zenoh-runtime/Cargo.toml index 0ffb3b83e2..41b052f842 100644 --- a/commons/zenoh-runtime/Cargo.toml +++ b/commons/zenoh-runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zenoh-runtime" -rust-version = "1.66.1" +rust-version = "1.70.0" version = { workspace = true } repository = { workspace = true } homepage = { workspace = true } diff --git a/zenoh-ext/examples/Cargo.toml b/zenoh-ext/examples/Cargo.toml index c9a7912554..3c1cf89fc9 100644 --- a/zenoh-ext/examples/Cargo.toml +++ b/zenoh-ext/examples/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.66.1" +rust-version = "1.70.0" name = "zenoh-ext-examples" version = { workspace = true } repository = { workspace = true } From 46369f9179475593724d4b6b2251323e3d1b7633 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 27 May 2024 15:43:48 +0200 Subject: [PATCH 20/33] fix: Incorrect zenohd MSRV --- Cargo.toml | 2 +- zenohd/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9036521c78..4f0134296b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,7 +91,7 @@ crc = "3.0.1" criterion = "0.5" derive_more = "0.99.17" derive-new = "0.6.0" -tracing-subscriber = { version = "0.3", features = ["json", "env-filter"] } +tracing-subscriber = {version = "0.3", features = ["json", "env-filter"]} tracing-loki = "0.2" event-listener = "4.0.0" flume = "0.11" diff --git a/zenohd/Cargo.toml b/zenohd/Cargo.toml index caf7169673..70efcfddfd 100644 --- a/zenohd/Cargo.toml +++ b/zenohd/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = { workspace = true } +rust-version = "1.72.0" name = "zenohd" version = { workspace = true } repository = { workspace = true } From 7166bda97a91f902ab60df135b610e692653a50a Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 10 Jun 2024 10:57:33 +0200 Subject: [PATCH 21/33] fix: Incorrect comment in CI workflow --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc6422c3ed..8bffb1d0e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -154,7 +154,7 @@ jobs: with: repo: ${{ github.repository }} # NOTE: As of commit 25f06bd, the minimum MSRV found in the workspace is 1.68. - # This value should be as low as possible to avoid needlessly checking older versions. + # This value should be as high as possible to avoid needlessly checking older versions. min: 1.68.0 # NOTE: In GitHub repository settings, the "Require status checks to pass From 3061ebe5593d6972257a840015272bc302c5f85b Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 10 Jun 2024 12:53:04 +0200 Subject: [PATCH 22/33] fix: Run msrvs job on multiple platforms --- .github/workflows/ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8bffb1d0e2..b3e0c33971 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -144,8 +144,14 @@ jobs: uses: crate-ci/typos@master msrvs: - name: MSRV checks - runs-on: ubuntu-latest + name: MSRV checks on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + # NOTE: It is necessary to run the check-msrv action on multiple platforms since a crate's MSRV + # depends on the target it's compiled for. + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, windows-latest, macos-13, macos-14] steps: - name: Clone this repository uses: actions/checkout@v4 From f1ac9cf07a7b563c43b9f0678a134d285172938e Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Fri, 14 Jun 2024 11:48:32 +0200 Subject: [PATCH 23/33] chore: Force-trigger CI From e2f8311e6d490076ce7c6a45eab085756ab6fedd Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Fri, 14 Jun 2024 11:51:09 +0200 Subject: [PATCH 24/33] chore: Force-trigger CI From a737477c57924bc7b1353c44885806502f2881db Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Fri, 14 Jun 2024 11:54:12 +0200 Subject: [PATCH 25/33] chore: Force-trigger CI From e82ce986794c9cb658ed8c79c356b90e1e824d5a Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Fri, 14 Jun 2024 13:40:14 +0200 Subject: [PATCH 26/33] chore: Force-trigger CI From 4055758cc252b7b2fe8f21996715249eb2ec87aa Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Fri, 14 Jun 2024 14:04:16 +0200 Subject: [PATCH 27/33] fix: Use multiple targets instead of multiple platforms --- .github/workflows/ci.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b3e0c33971..4a884e5024 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -144,14 +144,20 @@ jobs: uses: crate-ci/typos@master msrvs: - name: MSRV checks on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - # NOTE: It is necessary to run the check-msrv action on multiple platforms since a crate's MSRV + name: MSRV checks for ${{ matrix.target }} + runs-on: macos-14 + # NOTE: It is necessary to run the check-msrv action for multiple targets since a crate's MSRV # depends on the target it's compiled for. strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-13, macos-14] + target: + - aarch64-apple-darwin + - aarch64-unknown-linux-gnu + - x86_64-unknown-linux-gnu + - x86_64-pc-windows-msvc + - arm-unknown-linux-gnueabihf + - armv7-unknown-linux-gnueabihf steps: - name: Clone this repository uses: actions/checkout@v4 @@ -162,6 +168,7 @@ jobs: # NOTE: As of commit 25f06bd, the minimum MSRV found in the workspace is 1.68. # This value should be as high as possible to avoid needlessly checking older versions. min: 1.68.0 + target: ${{ matrix.target }} # NOTE: In GitHub repository settings, the "Require status checks to pass # before merging" branch protection rule ensures that commits are only merged From 63d64bb0c63a100305faddda0d3be19ce1935cc6 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Fri, 14 Jun 2024 14:37:58 +0200 Subject: [PATCH 28/33] chore: Use latest patch Rust releases --- Cargo.toml | 4 ++-- commons/zenoh-buffers/Cargo.toml | 2 +- commons/zenoh-codec/Cargo.toml | 25 ++++++++----------------- commons/zenoh-collections/Cargo.toml | 2 +- commons/zenoh-crypto/Cargo.toml | 2 +- commons/zenoh-keyexpr/Cargo.toml | 2 +- commons/zenoh-protocol/Cargo.toml | 2 +- commons/zenoh-result/Cargo.toml | 2 +- commons/zenoh-shm/Cargo.toml | 4 ++-- zenohd/Cargo.toml | 14 +++++++------- 10 files changed, 25 insertions(+), 34 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4f0134296b..e852a47409 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,7 +56,7 @@ members = [ exclude = ["ci/nostd-check", "ci/valgrind-check"] [workspace.package] -rust-version = "1.72.0" +rust-version = "1.72.1" version = "0.11.0-dev" # Zenoh version repository = "https://github.com/eclipse-zenoh/zenoh" homepage = "http://zenoh.io" @@ -91,7 +91,7 @@ crc = "3.0.1" criterion = "0.5" derive_more = "0.99.17" derive-new = "0.6.0" -tracing-subscriber = {version = "0.3", features = ["json", "env-filter"]} +tracing-subscriber = { version = "0.3", features = ["json", "env-filter"] } tracing-loki = "0.2" event-listener = "4.0.0" flume = "0.11" diff --git a/commons/zenoh-buffers/Cargo.toml b/commons/zenoh-buffers/Cargo.toml index 90b50b65d0..09de5ce491 100644 --- a/commons/zenoh-buffers/Cargo.toml +++ b/commons/zenoh-buffers/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.68.0" +rust-version = "1.68.2" name = "zenoh-buffers" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-codec/Cargo.toml b/commons/zenoh-codec/Cargo.toml index 4488b9f88f..6f66f98c00 100644 --- a/commons/zenoh-codec/Cargo.toml +++ b/commons/zenoh-codec/Cargo.toml @@ -12,15 +12,15 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.68.0" +rust-version = "1.68.2" name = "zenoh-codec" version = { workspace = true } repository = { workspace = true } homepage = { workspace = true } authors = [ - "kydos ", - "Luca Cominardi ", - "Pierre Avital ", + "kydos ", + "Luca Cominardi ", + "Pierre Avital ", ] edition = { workspace = true } license = { workspace = true } @@ -30,21 +30,12 @@ description = "Internal crate for zenoh." [features] default = ["std"] -std = [ - "tracing", - "serde/std", - "uhlc/std", - "zenoh-protocol/std" -] -shared-memory = [ - "std", - "zenoh-shm", - "zenoh-protocol/shared-memory" -] +std = ["tracing", "serde/std", "uhlc/std", "zenoh-protocol/std"] +shared-memory = ["std", "zenoh-shm", "zenoh-protocol/shared-memory"] complete_n = ["zenoh-protocol/complete_n"] [dependencies] -tracing = {workspace = true, optional = true } +tracing = { workspace = true, optional = true } serde = { workspace = true, features = ["alloc"] } uhlc = { workspace = true } zenoh-buffers = { workspace = true, default-features = false } @@ -57,7 +48,7 @@ criterion = { workspace = true } rand = { workspace = true, features = ["default"] } zenoh-protocol = { workspace = true, features = ["test"] } -zenoh-util = {workspace = true } +zenoh-util = { workspace = true } [[bench]] name = "codec" diff --git a/commons/zenoh-collections/Cargo.toml b/commons/zenoh-collections/Cargo.toml index 343a643f14..b0f46ac92a 100644 --- a/commons/zenoh-collections/Cargo.toml +++ b/commons/zenoh-collections/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.68.0" +rust-version = "1.68.2" name = "zenoh-collections" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-crypto/Cargo.toml b/commons/zenoh-crypto/Cargo.toml index 26fb7e4f28..1134377e67 100644 --- a/commons/zenoh-crypto/Cargo.toml +++ b/commons/zenoh-crypto/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.68.0" +rust-version = "1.68.2" name = "zenoh-crypto" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-keyexpr/Cargo.toml b/commons/zenoh-keyexpr/Cargo.toml index c85e70d4bf..ab0d9f7dca 100644 --- a/commons/zenoh-keyexpr/Cargo.toml +++ b/commons/zenoh-keyexpr/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.68.0" +rust-version = "1.68.2" name = "zenoh-keyexpr" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-protocol/Cargo.toml b/commons/zenoh-protocol/Cargo.toml index 4ef9d73881..4448d4765c 100644 --- a/commons/zenoh-protocol/Cargo.toml +++ b/commons/zenoh-protocol/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.68.0" +rust-version = "1.68.2" name = "zenoh-protocol" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-result/Cargo.toml b/commons/zenoh-result/Cargo.toml index 6909f073a1..4fdedd250d 100644 --- a/commons/zenoh-result/Cargo.toml +++ b/commons/zenoh-result/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.68.0" +rust-version = "1.68.2" name = "zenoh-result" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-shm/Cargo.toml b/commons/zenoh-shm/Cargo.toml index da53a216ce..72ebd67a1c 100644 --- a/commons/zenoh-shm/Cargo.toml +++ b/commons/zenoh-shm/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.68.0" +rust-version = "1.68.2" name = "zenoh-shm" version = { workspace = true } repository = { workspace = true } @@ -29,7 +29,7 @@ description = "Internal crate for zenoh." # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tracing = {workspace = true} +tracing = { workspace = true } serde = { workspace = true, features = ["default"] } shared_memory = { workspace = true } zenoh-buffers = { workspace = true } diff --git a/zenohd/Cargo.toml b/zenohd/Cargo.toml index 70efcfddfd..61e940497d 100644 --- a/zenohd/Cargo.toml +++ b/zenohd/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.72.0" +rust-version = "1.72.1" name = "zenohd" version = { workspace = true } repository = { workspace = true } @@ -28,20 +28,20 @@ readme = "README.md" [features] default = ["zenoh/default"] shared-memory = ["zenoh/shared-memory"] -loki = ["tracing-loki","url"] +loki = ["tracing-loki", "url"] [dependencies] tokio = { workspace = true, features = ["rt-multi-thread"] } clap = { workspace = true, features = ["derive"] } -zenoh-util = {workspace = true } +zenoh-util = { workspace = true } futures = { workspace = true } git-version = { workspace = true } json5 = { workspace = true } lazy_static = { workspace = true } -tracing = {workspace = true} -tracing-subscriber = {workspace = true} -tracing-loki = {workspace = true, optional = true } -url = {workspace = true, optional = true } +tracing = { workspace = true } +tracing-subscriber = { workspace = true } +tracing-loki = { workspace = true, optional = true } +url = { workspace = true, optional = true } zenoh = { workspace = true, features = ["unstable", "plugins"] } [dev-dependencies] From cdf9d09575bcd8740870436942785cb9fcc13a86 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Fri, 14 Jun 2024 14:40:05 +0200 Subject: [PATCH 29/33] chore: Roll back to multi-platform job --- .github/workflows/ci.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a884e5024..ca48368b7b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -144,20 +144,18 @@ jobs: uses: crate-ci/typos@master msrvs: - name: MSRV checks for ${{ matrix.target }} - runs-on: macos-14 - # NOTE: It is necessary to run the check-msrv action for multiple targets since a crate's MSRV + name: MSRV checks on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + # NOTE: It is necessary to run the check-msrv action on platforms since a crate's MSRV # depends on the target it's compiled for. strategy: fail-fast: false matrix: - target: - - aarch64-apple-darwin - - aarch64-unknown-linux-gnu - - x86_64-unknown-linux-gnu - - x86_64-pc-windows-msvc - - arm-unknown-linux-gnueabihf - - armv7-unknown-linux-gnueabihf + os: + - ubuntu-latest + - macos-13 + - macos-14 + # - windows-latest steps: - name: Clone this repository uses: actions/checkout@v4 @@ -167,8 +165,7 @@ jobs: repo: ${{ github.repository }} # NOTE: As of commit 25f06bd, the minimum MSRV found in the workspace is 1.68. # This value should be as high as possible to avoid needlessly checking older versions. - min: 1.68.0 - target: ${{ matrix.target }} + min: 1.68.2 # NOTE: In GitHub repository settings, the "Require status checks to pass # before merging" branch protection rule ensures that commits are only merged From 841a44ee71c3cf981fd759b5665ef25b303e5eca Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Fri, 14 Jun 2024 14:42:01 +0200 Subject: [PATCH 30/33] chore: Bump Rust toolchain from 1.72.0 to 1.72.1 --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 743f7cd993..7eb23c42c2 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.72.0" +channel = "1.72.1" From 6f35caa0723c9945512b823b256e7e3d311e8867 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Fri, 14 Jun 2024 14:58:50 +0200 Subject: [PATCH 31/33] chore: Force-trigger CI From f5175119e37db955358c7e207d5d3fe1a5811ffa Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Fri, 14 Jun 2024 15:16:34 +0200 Subject: [PATCH 32/33] chore: Fix MSRVs on macos-14 --- commons/zenoh-codec/Cargo.toml | 2 +- commons/zenoh-config/Cargo.toml | 2 +- commons/zenoh-core/Cargo.toml | 2 +- commons/zenoh-keyexpr/Cargo.toml | 2 +- commons/zenoh-protocol/Cargo.toml | 2 +- commons/zenoh-runtime/Cargo.toml | 2 +- commons/zenoh-sync/Cargo.toml | 2 +- commons/zenoh-task/Cargo.toml | 2 +- commons/zenoh-util/Cargo.toml | 2 +- examples/Cargo.toml | 2 +- io/zenoh-link-commons/Cargo.toml | 2 +- io/zenoh-link/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-quic/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-serial/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-tcp/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-tls/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-udp/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-unixpipe/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-vsock/Cargo.toml | 2 +- io/zenoh-links/zenoh-link-ws/Cargo.toml | 2 +- io/zenoh-transport/Cargo.toml | 2 +- plugins/zenoh-backend-example/Cargo.toml | 2 +- plugins/zenoh-backend-traits/Cargo.toml | 2 +- plugins/zenoh-plugin-example/Cargo.toml | 2 +- plugins/zenoh-plugin-rest/Cargo.toml | 6 +++--- plugins/zenoh-plugin-storage-manager/Cargo.toml | 2 +- plugins/zenoh-plugin-trait/Cargo.toml | 6 +++--- zenoh-ext/Cargo.toml | 2 +- zenoh-ext/examples/Cargo.toml | 2 +- zenoh/Cargo.toml | 2 +- 31 files changed, 35 insertions(+), 35 deletions(-) diff --git a/commons/zenoh-codec/Cargo.toml b/commons/zenoh-codec/Cargo.toml index 6f66f98c00..d5bbc80459 100644 --- a/commons/zenoh-codec/Cargo.toml +++ b/commons/zenoh-codec/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.68.2" +rust-version = "1.72.1" name = "zenoh-codec" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-config/Cargo.toml b/commons/zenoh-config/Cargo.toml index 60b76fe274..03e5bcd37b 100644 --- a/commons/zenoh-config/Cargo.toml +++ b/commons/zenoh-config/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-config" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-core/Cargo.toml b/commons/zenoh-core/Cargo.toml index e338e826f7..78c46af3f3 100644 --- a/commons/zenoh-core/Cargo.toml +++ b/commons/zenoh-core/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-core" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-keyexpr/Cargo.toml b/commons/zenoh-keyexpr/Cargo.toml index ab0d9f7dca..f31192af53 100644 --- a/commons/zenoh-keyexpr/Cargo.toml +++ b/commons/zenoh-keyexpr/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.68.2" +rust-version = "1.72.1" name = "zenoh-keyexpr" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-protocol/Cargo.toml b/commons/zenoh-protocol/Cargo.toml index 4448d4765c..973eed2e6e 100644 --- a/commons/zenoh-protocol/Cargo.toml +++ b/commons/zenoh-protocol/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.68.2" +rust-version = "1.72.1" name = "zenoh-protocol" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-runtime/Cargo.toml b/commons/zenoh-runtime/Cargo.toml index 41b052f842..c8667d30cc 100644 --- a/commons/zenoh-runtime/Cargo.toml +++ b/commons/zenoh-runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zenoh-runtime" -rust-version = "1.70.0" +rust-version = "1.72.1" version = { workspace = true } repository = { workspace = true } homepage = { workspace = true } diff --git a/commons/zenoh-sync/Cargo.toml b/commons/zenoh-sync/Cargo.toml index 2e949dccd4..c3af8e09f5 100644 --- a/commons/zenoh-sync/Cargo.toml +++ b/commons/zenoh-sync/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-sync" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-task/Cargo.toml b/commons/zenoh-task/Cargo.toml index 79b9cbda0e..ae590ec053 100644 --- a/commons/zenoh-task/Cargo.toml +++ b/commons/zenoh-task/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-task" version = { workspace = true } repository = { workspace = true } diff --git a/commons/zenoh-util/Cargo.toml b/commons/zenoh-util/Cargo.toml index a643292b19..d37cb63761 100644 --- a/commons/zenoh-util/Cargo.toml +++ b/commons/zenoh-util/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-util" version = { workspace = true } repository = { workspace = true } diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 23a0846d38..84cfc445de 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-examples" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-link-commons/Cargo.toml b/io/zenoh-link-commons/Cargo.toml index 95d9408b85..10f381028a 100644 --- a/io/zenoh-link-commons/Cargo.toml +++ b/io/zenoh-link-commons/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" authors = { workspace = true } categories = { workspace = true } description = "Internal crate for zenoh." diff --git a/io/zenoh-link/Cargo.toml b/io/zenoh-link/Cargo.toml index dff582a112..56d8dfffaf 100644 --- a/io/zenoh-link/Cargo.toml +++ b/io/zenoh-link/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-link" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-quic/Cargo.toml b/io/zenoh-links/zenoh-link-quic/Cargo.toml index fc1f959966..5fe1d6d67f 100644 --- a/io/zenoh-links/zenoh-link-quic/Cargo.toml +++ b/io/zenoh-links/zenoh-link-quic/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" authors = { workspace = true } categories = { workspace = true } description = "Internal crate for zenoh." diff --git a/io/zenoh-links/zenoh-link-serial/Cargo.toml b/io/zenoh-links/zenoh-link-serial/Cargo.toml index ae18010c2d..3dbbcbc935 100644 --- a/io/zenoh-links/zenoh-link-serial/Cargo.toml +++ b/io/zenoh-links/zenoh-link-serial/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-link-serial" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-tcp/Cargo.toml b/io/zenoh-links/zenoh-link-tcp/Cargo.toml index c010fdeeac..0e565fc96c 100644 --- a/io/zenoh-links/zenoh-link-tcp/Cargo.toml +++ b/io/zenoh-links/zenoh-link-tcp/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-link-tcp" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-tls/Cargo.toml b/io/zenoh-links/zenoh-link-tls/Cargo.toml index f458f17ebe..337b3310eb 100644 --- a/io/zenoh-links/zenoh-link-tls/Cargo.toml +++ b/io/zenoh-links/zenoh-link-tls/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" authors = { workspace = true } categories = { workspace = true } description = "Internal crate for zenoh." diff --git a/io/zenoh-links/zenoh-link-udp/Cargo.toml b/io/zenoh-links/zenoh-link-udp/Cargo.toml index a01af595c9..f8eb6f495d 100644 --- a/io/zenoh-links/zenoh-link-udp/Cargo.toml +++ b/io/zenoh-links/zenoh-link-udp/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-link-udp" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml b/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml index e0f77dae88..35c3eb7f25 100644 --- a/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml +++ b/io/zenoh-links/zenoh-link-unixpipe/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-link-unixpipe" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml b/io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml index be32326db4..7aca05111d 100644 --- a/io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml +++ b/io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-link-unixsock_stream" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-vsock/Cargo.toml b/io/zenoh-links/zenoh-link-vsock/Cargo.toml index 9c41c938b9..68ceecb2f3 100644 --- a/io/zenoh-links/zenoh-link-vsock/Cargo.toml +++ b/io/zenoh-links/zenoh-link-vsock/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-link-vsock" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-links/zenoh-link-ws/Cargo.toml b/io/zenoh-links/zenoh-link-ws/Cargo.toml index 559c58378b..da839ae7df 100644 --- a/io/zenoh-links/zenoh-link-ws/Cargo.toml +++ b/io/zenoh-links/zenoh-link-ws/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-link-ws" version = { workspace = true } repository = { workspace = true } diff --git a/io/zenoh-transport/Cargo.toml b/io/zenoh-transport/Cargo.toml index 0adba06e80..5ffc8b73d7 100644 --- a/io/zenoh-transport/Cargo.toml +++ b/io/zenoh-transport/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-transport" version = { workspace = true } repository = { workspace = true } diff --git a/plugins/zenoh-backend-example/Cargo.toml b/plugins/zenoh-backend-example/Cargo.toml index 0e5c68525d..8b16fb5407 100644 --- a/plugins/zenoh-backend-example/Cargo.toml +++ b/plugins/zenoh-backend-example/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-backend-example" version = { workspace = true } authors = { workspace = true } diff --git a/plugins/zenoh-backend-traits/Cargo.toml b/plugins/zenoh-backend-traits/Cargo.toml index 5e7d361fe0..ddbb968506 100644 --- a/plugins/zenoh-backend-traits/Cargo.toml +++ b/plugins/zenoh-backend-traits/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh_backend_traits" version = { workspace = true } repository = { workspace = true } diff --git a/plugins/zenoh-plugin-example/Cargo.toml b/plugins/zenoh-plugin-example/Cargo.toml index e8dc81fcb6..b3b910f065 100644 --- a/plugins/zenoh-plugin-example/Cargo.toml +++ b/plugins/zenoh-plugin-example/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-plugin-example" version = { workspace = true } authors = { workspace = true } diff --git a/plugins/zenoh-plugin-rest/Cargo.toml b/plugins/zenoh-plugin-rest/Cargo.toml index eeaa0e0328..adcf5bacce 100644 --- a/plugins/zenoh-plugin-rest/Cargo.toml +++ b/plugins/zenoh-plugin-rest/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-plugin-rest" version = { workspace = true } repository = { workspace = true } @@ -36,13 +36,13 @@ anyhow = { workspace = true, features = ["default"] } async-std = { workspace = true, features = ["default", "attributes"] } base64 = { workspace = true } const_format = { workspace = true } -zenoh-util = {workspace = true } +zenoh-util = { workspace = true } flume = { workspace = true } futures = { workspace = true } git-version = { workspace = true } http-types = { workspace = true } lazy_static = { workspace = true } -tracing = {workspace = true} +tracing = { workspace = true } schemars = { workspace = true } serde = { workspace = true, features = ["default"] } serde_json = { workspace = true } diff --git a/plugins/zenoh-plugin-storage-manager/Cargo.toml b/plugins/zenoh-plugin-storage-manager/Cargo.toml index 7152634c82..012e4b0093 100644 --- a/plugins/zenoh-plugin-storage-manager/Cargo.toml +++ b/plugins/zenoh-plugin-storage-manager/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-plugin-storage-manager" version = { workspace = true } repository = { workspace = true } diff --git a/plugins/zenoh-plugin-trait/Cargo.toml b/plugins/zenoh-plugin-trait/Cargo.toml index 41d3388946..4014423f4b 100644 --- a/plugins/zenoh-plugin-trait/Cargo.toml +++ b/plugins/zenoh-plugin-trait/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-plugin-trait" version = { workspace = true } repository = { workspace = true } @@ -28,11 +28,11 @@ name = "zenoh_plugin_trait" [dependencies] libloading = { workspace = true } -tracing = {workspace = true} +tracing = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } zenoh-macros = { workspace = true } zenoh-result = { workspace = true } zenoh-util = { workspace = true } zenoh-keyexpr = { workspace = true } -const_format = { workspace = true } \ No newline at end of file +const_format = { workspace = true } diff --git a/zenoh-ext/Cargo.toml b/zenoh-ext/Cargo.toml index 7b849c7717..cb0754db26 100644 --- a/zenoh-ext/Cargo.toml +++ b/zenoh-ext/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-ext" version = { workspace = true } repository = { workspace = true } diff --git a/zenoh-ext/examples/Cargo.toml b/zenoh-ext/examples/Cargo.toml index 3c1cf89fc9..4a207be0de 100644 --- a/zenoh-ext/examples/Cargo.toml +++ b/zenoh-ext/examples/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-ext-examples" version = { workspace = true } repository = { workspace = true } diff --git a/zenoh/Cargo.toml b/zenoh/Cargo.toml index 1c7d947d31..4f28355dd8 100644 --- a/zenoh/Cargo.toml +++ b/zenoh/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh" version = { workspace = true } repository = { workspace = true } From f428ccfcf202e2f456e548c7aab17e74cb9dca46 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Fri, 14 Jun 2024 15:27:44 +0200 Subject: [PATCH 33/33] chore: Fix zenoh-macos MSRV for macos-14 --- commons/zenoh-macros/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons/zenoh-macros/Cargo.toml b/commons/zenoh-macros/Cargo.toml index b69629d804..e7661d1f57 100644 --- a/commons/zenoh-macros/Cargo.toml +++ b/commons/zenoh-macros/Cargo.toml @@ -12,7 +12,7 @@ # ZettaScale Zenoh Team, # [package] -rust-version = "1.70.0" +rust-version = "1.72.1" name = "zenoh-macros" version = { workspace = true } repository = { workspace = true }