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.

Sign up for GitHub

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

Jump to bottom

Unify common deps to the same version in Cargo.toml of the worksppace #285

Merged
merged 18 commits into from
Jul 25, 2023
Merged

Unify common deps to the same version in Cargo.toml of the worksppace #285

merged 18 commits into from
Jul 25, 2023

Conversation

Xynnn007
Copy link
Member

This PR unifies common deps to the same version via *.workspace = true.

This will help to maintain the dependencies of the whole workspace without fix them case by case.

@Xynnn007
dep: unify the prost version for the workspace
5c45abe 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
dep: unify tokio version for the workspace
d9fbaec 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
dep: unify strum version for the workspace
c9f775a 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007 Xynnn007 self-assigned this Jul 17, 2023
@Xynnn007 Xynnn007 marked this pull request as draft July 17, 2023 08:50
@Xynnn007
dep: unify clap version for the workspace
bc8164c 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
dep: unify tonic & tonic-build dep version
fede075 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
dep: unify ttrpc stack version for the workspace
0094e7b 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
dep: unify crypto versions for the workspace
5e95692 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
dep: unify reqwest version for workspace
6b65d46 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
dep: unify anyhow dep version for workspace
989d619 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
dep: unify cfg-if version for workspace
1091f7d 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
dep: unify serde & serde_json version for workspace
1a8f18b 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
dep: unify async-trait version for workspace
06c59ee 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
dep: unify dep version for lazy_static
95bed95 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
ci: install protoc for coco keyprovider
7c0abf3 
Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
ci: install protoc for cc-kbc
ccaaf0e 
protoc is needed in step `Build and install with feature`, as it by
default uses gRPC.

Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
Cargo.toml: update edition from "2018" to "2021"
390c742 
Due to hyperium/tonic#1345, we should update
the rust compiler and project to support tonic 0.9

Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
attestation-agent/kbs: disable openssl as dependency when using rust-…
c295aad 
…crypto

https://doc.rust-lang.org/cargo/reference/features.html suggests that a
question mark in the feature to ensure that this dependency will not be
activated when nowhere else activates that.

Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007
attestation-agent: fix arguments input for sockets
268d049 
clap derived arguments uses `-` but the arguments definition is required
an undercore `_`

Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
@Xynnn007 Xynnn007 marked this pull request as ready for review July 19, 2023 08:25
@Xynnn007 Xynnn007 mentioned this pull request Jul 20, 2023
Merged
@jiangliu
Copy link
Member

Any introduction about the workspace attribute in dependency?
What happens when publishing a crate with dep.workspeace attribute?

@Xynnn007
Copy link
Member Author

Xynnn007 commented Jul 25, 2023 •
edited
Loading

@jiangliu The workspace = true will use the same version as the workspace's Cargo.toml

I tried with the command cargo publish --dry-run -p coco_keyprovider

and it will do all the steps to publish a crate to crates.io except uploading that. This will also geenrate a source code package to be uploaded in target/package/coco_keyprovider-0.1.0, whose Cargo.toml is like

...
[dependencies.aes-gcm]
version = "0.10.2"

[dependencies.anyhow]
version = "1.0"

[dependencies.base64]
version = "0.13.0"
...

That means all the XXX.workspace = true is translated into a version of that package in crates.io

Why I use .workspace = true is that ocicrypt-rs/image-rs and attestation-agent stack are built in a same final binary. Use same version dep will help to decrease the built binary size and be easy to maintain.

@jiangliu jiangliu merged commit eef059b into confidential-containers:main Jul 25, 2023
@Xynnn007 Xynnn007 deleted the fix-dep branch July 25, 2023 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jiangliu jiangliu jiangliu approved these changes

@sameo sameo Awaiting requested review from sameo

@arronwy arronwy Awaiting requested review from arronwy

@lumjjb lumjjb Awaiting requested review from lumjjb

@jialez0 jialez0 Awaiting requested review from jialez0

Assignees

@Xynnn007 Xynnn007

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Xynnn007 @jiangliu