Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check crate MSRVs #1026

Draft
wants to merge 33 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
eb75d32
feat: Check MSRV
fuzzypixelz May 14, 2024
1ae1a74
chore: Force-trigger CI
fuzzypixelz May 14, 2024
b03582b
chore: Move MSRV check before Clippy lints
fuzzypixelz May 14, 2024
26ca5c2
core: Re-trigger CI
fuzzypixelz May 14, 2024
4640d38
core: Re-trigger CI
fuzzypixelz May 14, 2024
8d82833
chore: Force-trigger CI
fuzzypixelz May 24, 2024
1eb20c0
chore: Force-trigger CI
fuzzypixelz May 24, 2024
25bbe35
chore: Force-trigger CI
fuzzypixelz May 27, 2024
01eb259
fix: Don't use `workspace.package.rust-version`
fuzzypixelz May 27, 2024
fccc773
chore: Force-trigger CI
fuzzypixelz May 27, 2024
9aa9bfa
chore: Force-trigger CI
fuzzypixelz May 27, 2024
30e835f
chore: Force-trigger CI
fuzzypixelz May 27, 2024
4990103
chore: Force-trigger CI
fuzzypixelz May 27, 2024
182b53a
fix: Move check into its own job
fuzzypixelz May 27, 2024
49906c5
fix: Set minimum checked MSRV to 1.68
fuzzypixelz May 27, 2024
798b3bd
fix: Specify `min` version's patch number
fuzzypixelz May 27, 2024
bb2e969
style: Rename msrvs job to start with noun
fuzzypixelz May 27, 2024
586ee70
fix: Incorrect crate MSRVs
fuzzypixelz May 27, 2024
fe7244b
fix: More incorrect MSRVs
fuzzypixelz May 27, 2024
46369f9
fix: Incorrect zenohd MSRV
fuzzypixelz May 27, 2024
7166bda
fix: Incorrect comment in CI workflow
fuzzypixelz Jun 10, 2024
3061ebe
fix: Run msrvs job on multiple platforms
fuzzypixelz Jun 10, 2024
f1ac9cf
chore: Force-trigger CI
fuzzypixelz Jun 14, 2024
e2f8311
chore: Force-trigger CI
fuzzypixelz Jun 14, 2024
a737477
chore: Force-trigger CI
fuzzypixelz Jun 14, 2024
e82ce98
chore: Force-trigger CI
fuzzypixelz Jun 14, 2024
4055758
fix: Use multiple targets instead of multiple platforms
fuzzypixelz Jun 14, 2024
63d64bb
chore: Use latest patch Rust releases
fuzzypixelz Jun 14, 2024
cdf9d09
chore: Roll back to multi-platform job
fuzzypixelz Jun 14, 2024
841a44e
chore: Bump Rust toolchain from 1.72.0 to 1.72.1
fuzzypixelz Jun 14, 2024
6f35caa
chore: Force-trigger CI
fuzzypixelz Jun 14, 2024
f517511
chore: Fix MSRVs on macos-14
fuzzypixelz Jun 14, 2024
f428ccf
chore: Fix zenoh-macos MSRV for macos-14
fuzzypixelz Jun 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,36 @@ 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: 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:
os:
- ubuntu-latest
- macos-13
- macos-14
# - windows-latest
steps:
- name: Clone this repository
uses: actions/checkout@v4

- 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 high as possible to avoid needlessly checking older versions.
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 branches where specific status checks have passed. These checks are
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-buffers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.68.2"
name = "zenoh-buffers"
version = { workspace = true }
repository = { workspace = true }
Expand Down
25 changes: 8 additions & 17 deletions commons/zenoh-codec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-codec"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
authors = [
"kydos <angelo@icorsaro.net>",
"Luca Cominardi <luca.cominardi@zettascale.tech>",
"Pierre Avital <pierre.avital@zettascale.tech>",
"kydos <angelo@icorsaro.net>",
"Luca Cominardi <luca.cominardi@zettascale.tech>",
"Pierre Avital <pierre.avital@zettascale.tech>",
]
edition = { workspace = true }
license = { workspace = true }
Expand All @@ -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 }
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-collections/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.68.2"
name = "zenoh-collections"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-config"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-core"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.68.2"
name = "zenoh-crypto"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-keyexpr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-keyexpr"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-macros"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-protocol"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-result/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.68.2"
name = "zenoh-result"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-runtime/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "zenoh-runtime"
rust-version = { workspace = true }
rust-version = "1.72.1"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions commons/zenoh-shm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.68.2"
name = "zenoh-shm"
version = { workspace = true }
repository = { workspace = true }
Expand All @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-sync/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-sync"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-task/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-task"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-util"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-examples"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion io/zenoh-link-commons/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = "1.72.1"
authors = { workspace = true }
categories = { workspace = true }
description = "Internal crate for zenoh."
Expand All @@ -20,7 +21,6 @@ homepage = { workspace = true }
license = { workspace = true }
name = "zenoh-link-commons"
repository = { workspace = true }
rust-version = { workspace = true }
version = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
2 changes: 1 addition & 1 deletion io/zenoh-link/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-link"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion io/zenoh-links/zenoh-link-quic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = "1.72.1"
authors = { workspace = true }
categories = { workspace = true }
description = "Internal crate for zenoh."
Expand All @@ -20,7 +21,6 @@ homepage = { workspace = true }
license = { workspace = true }
name = "zenoh-link-quic"
repository = { workspace = true }
rust-version = { workspace = true }
version = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
2 changes: 1 addition & 1 deletion io/zenoh-links/zenoh-link-serial/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-link-serial"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion io/zenoh-links/zenoh-link-tcp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-link-tcp"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion io/zenoh-links/zenoh-link-tls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = "1.72.1"
authors = { workspace = true }
categories = { workspace = true }
description = "Internal crate for zenoh."
Expand All @@ -20,7 +21,6 @@ homepage = { workspace = true }
license = { workspace = true }
name = "zenoh-link-tls"
repository = { workspace = true }
rust-version = { workspace = true }
version = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
2 changes: 1 addition & 1 deletion io/zenoh-links/zenoh-link-udp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-link-udp"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion io/zenoh-links/zenoh-link-unixpipe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-link-unixpipe"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion io/zenoh-links/zenoh-link-unixsock_stream/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-link-unixsock_stream"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion io/zenoh-links/zenoh-link-vsock/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-link-vsock"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion io/zenoh-links/zenoh-link-ws/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-link-ws"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion io/zenoh-transport/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-transport"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion plugins/zenoh-backend-example/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-backend-example"
version = { workspace = true }
authors = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion plugins/zenoh-backend-traits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh_backend_traits"
version = { workspace = true }
repository = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion plugins/zenoh-plugin-example/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
rust-version = { workspace = true }
rust-version = "1.72.1"
name = "zenoh-plugin-example"
version = { workspace = true }
authors = { workspace = true }
Expand Down
Loading
Loading