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

Cleanup Cargo.lock files across workspace #533

Merged
merged 1 commit into from Apr 23, 2022
Merged

Conversation

tarcieri
Copy link
Member

Removes stale Cargo.lock files leftover from when before all of the crates in this workspace were merged into a single repo.

Also moves platforms/markdown-table-gen out of the toplevel workspace, and ignores lockfiles for both it and platforms/platforms-data-gen.

Removes stale `Cargo.lock` files leftover from when before all of the
crates in this workspace were merged into a single repo.

Also moves `platforms/markdown-table-gen` out of the toplevel workspace,
and ignores lockfiles for both it and `platforms/platforms-data-gen`.
@tarcieri tarcieri merged commit 5e60905 into main Apr 23, 2022
tarcieri added a commit that referenced this pull request Apr 23, 2022
The `version` field was previously being completely ignored.

This commit first fixes the tests so they run locally again (they were
broken in #533 but due to a quirk of how CI runs, namely nuking the
toplevel workspace Cargo.toml to support a 1.40 MSRV, they continued to
pass in CI).

It removes all previous dependencies on `cargo-lock` having a Cargo.lock
file (kind of silly to use something that changes as a test vector) and
replaces it with explicit V2 and V3 lockfile test vectors, which are now
in a newly renamed `tests/examples` directory.

Finally, it fixes parsing of V3 lockfiles, actually paying attention to
the `version` field if present.
tarcieri added a commit that referenced this pull request Apr 23, 2022
The `version` field was previously being completely ignored.

This commit first fixes the tests so they run locally again (they were
broken in #533 but due to a quirk of how CI runs, namely nuking the
toplevel workspace Cargo.toml to support a 1.40 MSRV, they continued to
pass in CI).

It removes all previous dependencies on `cargo-lock` having a Cargo.lock
file (kind of silly to use something that changes as a test vector) and
replaces it with explicit V2 and V3 lockfile test vectors, which are now
in a newly renamed `tests/examples` directory.

Finally, it fixes parsing of V3 lockfiles, actually paying attention to
the `version` field if present.
tarcieri added a commit that referenced this pull request Apr 23, 2022
The `version` field was previously being completely ignored.

This commit first fixes the tests so they run locally again (they were
broken in #533 but due to a quirk of how CI runs, namely nuking the
toplevel workspace Cargo.toml to support a 1.40 MSRV, they continued to
pass in CI).

It removes all previous dependencies on `cargo-lock` having a Cargo.lock
file (kind of silly to use something that changes as a test vector) and
replaces it with explicit V2 and V3 lockfile test vectors, which are now
in a newly renamed `tests/examples` directory.

Finally, it fixes parsing of V3 lockfiles, actually paying attention to
the `version` field if present.
tarcieri added a commit that referenced this pull request Apr 23, 2022
The `version` field was previously being completely ignored.

This commit first fixes the tests so they run locally again (they were
broken in #533 but due to a quirk of how CI runs, namely nuking the
toplevel workspace Cargo.toml to support a 1.40 MSRV, they continued to
pass in CI).

It removes all previous dependencies on `cargo-lock` having a Cargo.lock
file (kind of silly to use something that changes as a test vector) and
replaces it with explicit V2 and V3 lockfile test vectors, which are now
in a newly renamed `tests/examples` directory.

Finally, it fixes parsing of V3 lockfiles, actually paying attention to
the `version` field if present.
tarcieri added a commit that referenced this pull request Apr 23, 2022
The `version` field was previously being completely ignored.

This commit first fixes the tests so they run locally again (they were
broken in #533 but due to a quirk of how CI runs, namely nuking the
toplevel workspace Cargo.toml to support a 1.40 MSRV, they continued to
pass in CI).

It removes all previous dependencies on `cargo-lock` having a Cargo.lock
file (kind of silly to use something that changes as a test vector) and
replaces it with explicit V2 and V3 lockfile test vectors, which are now
in a newly renamed `tests/examples` directory.

Finally, it fixes parsing of V3 lockfiles, actually paying attention to
the `version` field if present.
@06kellyjac
Copy link

..., it is recommended that all binaries check in their Cargo.lock.

cargo-audit is a binary so it should really have kept it's Cargo.lock file IMO

cc: @tarcieri

@tarcieri tarcieri deleted the lockfile-cleanup branch October 7, 2022 12:25
@tarcieri
Copy link
Member Author

tarcieri commented Oct 7, 2022

The intent of this PR was to remove the leftover crate-specific Cargo.lock files after combining the repo, now that all of the crates are in a workspace.

A workspace shares a single Cargo.lock file.

It seems a recent commit removed the toplevel Cargo.lock, however. Edit: aah, it was 8deceb7

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants