refactor: Use cargo autoinherit to factorize the dependencies#3477
refactor: Use cargo autoinherit to factorize the dependencies#3477lu-zero wants to merge 2 commits intoyouki-dev:mainfrom
Conversation
saku3
left a comment
There was a problem hiding this comment.
Thanks for the PR.
In addition to checking cargo tree, could you also verify that the version-up script works correctly?
https://github.com/youki-dev/youki/blob/main/justfile#L203
tests/contest/contest/Cargo.toml
Outdated
| tracing = { workspace = true, features = ["attributes"] } | ||
| tracing-subscriber = { workspace = true, features = ["json", "env-filter"] } | ||
| regex = { workspace = true } | ||
| clap= { workspace = true, features = ["std", "suggestions", "derive", "cargo", "help", "usage", "error-context"] } |
There was a problem hiding this comment.
| clap= { workspace = true, features = ["std", "suggestions", "derive", "cargo", "help", "usage", "error-context"] } | |
| clap = { workspace = true, features = ["std", "suggestions", "derive", "cargo", "help", "usage", "error-context"] } |
crates/youki/Cargo.toml
Outdated
| [dependencies] | ||
| anyhow = "1.0.102" | ||
| chrono = { version = "0.4", default-features = false, features = ["clock", "serde"] } | ||
| clap= { workspace = true, features = ["std", "suggestions", "derive", "cargo", "help", "usage", "error-context"] } |
There was a problem hiding this comment.
| clap= { workspace = true, features = ["std", "suggestions", "derive", "cargo", "help", "usage", "error-context"] } | |
| clap = { workspace = true, features = ["std", "suggestions", "derive", "cargo", "help", "usage", "error-context"] } |
Cargo.toml
Outdated
| flate2 = "1.1" | ||
| libbpf-sys = "1.6.4" | ||
| libc = "0.2.180" | ||
| liboci-cli = { version = "0.6.0", path = "crates/liboci-cli" } |
There was a problem hiding this comment.
https://github.com/youki-dev/youki/blob/main/justfile#L203
# MARK: Version is needed for tagpr to run the version-up script above.
| liboci-cli = { version = "0.6.0", path = "crates/liboci-cli" } | |
| liboci-cli = { version = "0.6.0", path = "crates/liboci-cli" } # MARK: Version |
There was a problem hiding this comment.
Sorry for the multiple comments, but could you address this as well?
Without this change, just version-up will no longer work correctly.
This is required for tagpr to update the version automatically.
crates/youki/Cargo.toml
Outdated
| tracing = { version = "0.1.44", features = ["attributes"] } | ||
| tracing-subscriber = { version = "0.3.23", features = ["json", "env-filter"] } | ||
| tracing-journald = "0.3.2" | ||
| liboci-cli = { workspace = true } # MARK: Version |
c64b721 to
b4656cd
Compare
|
rebased, changed folded and sorted the version to be last to fit the script. |
b4656cd to
2ec903f
Compare
saku3
left a comment
There was a problem hiding this comment.
Thank you for the update.
Could you also check whether the DCO sign-off is in place?
https://github.com/youki-dev/youki/pull/3477/checks?check_run_id=70048530980
| @@ -1,7 +0,0 @@ | |||
| [workspace] | |||
There was a problem hiding this comment.
This file should not be removed.
Without it, neither cargo tree nor the build will work.
It looks like something may have gone wrong during the rebase.
crates/libcgroups/Cargo.toml
Outdated
| nix = { workspace = true, features = ["signal", "user", "fs"] } | ||
| procfs = { workspace = true } | ||
| pathrs = { workspace = true } | ||
| oci-spec = { version = "~0.9.0", features = ["runtime"] } |
There was a problem hiding this comment.
It would be good to unify oci-spec as well.
I'd like to settle this here as well. I think ~0.9.0 is fine.
2ec903f to
53db457
Compare
|
Please also address the comment about |
dd9fefc to
0a59a02
Compare
|
The CI should pass once the latest upstream changes are merged in. Sorry for the extra work, but could you please merge the latest upstream changes? |
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
0a59a02 to
8db7376
Compare
|
Every time I have to redo the patch from scratch, luckily it is 90% automated. |
|
I’m sorry, I committed this by mistake. Would it be possible to remove the following commit? |
7ffbee6 to
8db7376
Compare
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8db7376 to
63110ac
Compare
|
Folded in, I hope that's what you have in mind :) |
saku3
left a comment
There was a problem hiding this comment.
Thank you very much for your repeated help.
|
@youki-dev/youki I think this is a good change that consolidates the dependencies. I’d appreciate it if you could take a look and check whether I’ve missed anything. Since changes to Cargo.toml tend to cause rebases more easily, I’d also appreciate it if this could be reviewed with priority. |
| crossbeam = "0.8.4" | ||
| env_logger = "0.11" | ||
| errno = "0.3.14" | ||
| fastrand = "2.3.0" |
There was a problem hiding this comment.
| fastrand = "2.3.0" | |
| fastrand = "^2.3.0" |
| thiserror = { workspace = true } | ||
| tracing = { workspace = true, features = ["attributes"] } | ||
| tracing-subscriber = { workspace = true, features = ["json", "env-filter"] } | ||
| regex = { workspace = true } |
There was a problem hiding this comment.
| regex = { workspace = true } | |
| regex = { workspace = true, features = ["std"] } |
| oci-spec = { workspace = true, features = ["proptests", "runtime"] } | ||
| quickcheck = { workspace = true } | ||
| mockall = { workspace = true, features = [] } | ||
| clap = { workspace = true } |
There was a problem hiding this comment.
| clap = { workspace = true } | |
| clap = { workspace = true, features = ["std", "color", "help", "usage", "error-context", "suggestions"] } |
ref: https://github.com/clap-rs/clap/blob/v4.5.13/Cargo.toml#L140-L148
cargo tree is unchanged.
Description
Refactor the dependencies so they versions are in sync across the workspace.
Type of Change
Testing
I ran cargo tree before and after.