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

Commit Cargo.lock to repository #346

Merged
merged 2 commits into from
Sep 28, 2023
Merged

Commit Cargo.lock to repository #346

merged 2 commits into from
Sep 28, 2023

Conversation

kpcyrd
Copy link
Contributor

@kpcyrd kpcyrd commented Sep 28, 2023

Related to #345

cpu
cpu reviewed Sep 28, 2023
View reviewed changes
.github/workflows/test.yaml Outdated Show resolved Hide resolved
@kpcyrd kpcyrd changed the title Commit Cargo.lock to repository and add cargo-audit github action Commit Cargo.lock to repository Sep 28, 2023
@djc
Copy link
Member

djc commented Sep 28, 2023

I think you'll want to make sure CI jobs use --locked to that the Cargo.lock is actually getting tested.

cpu
cpu approved these changes Sep 28, 2023
View reviewed changes
Copy link
Member

@cpu cpu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me and seems in keeping with the updated guidance from the Rust project on committing lockfiles 👍

@kpcyrd
Copy link
Contributor Author

kpcyrd commented Sep 28, 2023

I've added --locked in multiple places, if Cargo.lock is compatible with Cargo.toml it should be picked up automatically, if it's out-of-sync multiple jobs would now start failing (including make).

cpu
cpu reviewed Sep 28, 2023
View reviewed changes
Makefile Show resolved Hide resolved
@cpu
Copy link
Member

cpu commented Sep 28, 2023

@jsha Do you have any reservations about checking in the Cargo.lock for this project?

jsha
jsha approved these changes Sep 28, 2023
View reviewed changes
Copy link
Collaborator

@jsha jsha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Thanks!

@jsha jsha merged commit 6c24d48 into rustls:main Sep 28, 2023
21 checks passed
@kpcyrd kpcyrd deleted the cargo-lock-cargo-audit branch September 28, 2023 22:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpu cpu cpu approved these changes

@jsha jsha jsha approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kpcyrd @djc @cpu @jsha