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

chore: Standardize Cargo.toml files, enable more workspace dependencies #200

Merged
merged 1 commit into from
Sep 21, 2023

Conversation

bryantbiggs
Copy link
Contributor

  • Attempt to unify and standardize the Cargo.toml files used through the project
    • Order the dependencies alphabetically; the async deps have been kept as a separate section but happy to include this in the mix as well
    • In the future it would be nice to use cargo-sort and have a CI check to keep it consistent but currently it lacks support for workspace inheritence
    • Hoist up dependencies to the main Cargo.toml and use the workspace dependency inheritance to align versions
    • Add keywords and categories sections where missing
  • Add the client examples to its Cargo.toml

@github-actions github-actions bot added C-runc-shim Runc shim C-shim-protos Shim protos C-shim Containerd shim C-logging Shim logging C-client Containerd client C-snapshots Remote snapshotter C-runc runc helper T-CI Changes in project's CI labels Sep 19, 2023
@bryantbiggs bryantbiggs force-pushed the chore/standardize-cargo-files branch from cd9e02f to fec01e5 Compare September 19, 2023 14:54
@mxpv mxpv requested a review from a team September 20, 2023 17:07
@mxpv mxpv added this pull request to the merge queue Sep 21, 2023
@jsturtevant
Copy link
Contributor

LGTM

@mxpv
Copy link
Member

mxpv commented Sep 21, 2023

@bryantbiggs Could you pls rebase changes to resolve merge conflicts?

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Sep 21, 2023
@bryantbiggs bryantbiggs force-pushed the chore/standardize-cargo-files branch from fec01e5 to 5e1b776 Compare September 21, 2023 17:04
@mxpv mxpv added this pull request to the merge queue Sep 21, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 21, 2023
@mxpv mxpv merged commit 38a67ac into containerd:main Sep 21, 2023
@bryantbiggs bryantbiggs deleted the chore/standardize-cargo-files branch September 21, 2023 23:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-client Containerd client C-logging Shim logging C-runc runc helper C-runc-shim Runc shim C-shim Containerd shim C-shim-protos Shim protos C-snapshots Remote snapshotter T-CI Changes in project's CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants