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

build: Update cargo deny configs to v0.6.2 #686

Merged
merged 1 commit into from
Jan 30, 2020
Merged

build: Update cargo deny configs to v0.6.2 #686

merged 1 commit into from
Jan 30, 2020

Conversation

iliana
Copy link
Contributor

@iliana iliana commented Jan 28, 2020

Issue #, if available: Closes #531

Description of changes:
Moving to the most recent cargo-deny, which simplifies these configs significantly. :)

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@iliana
Copy link
Contributor Author

iliana commented Jan 28, 2020

@jahkeup CI failure seems to be due to cargo-deny 0.2.6 being installed, do we have to deploy a new build container for this?

@jahkeup
Copy link
Member

jahkeup commented Jan 28, 2020

@iliana yep, we'll need the crates listing updated and then rebuild + push for the CI environment to pick up the change.

@iliana
Copy link
Contributor Author

iliana commented Jan 28, 2020

It's updated in this PR, do we want to kick off a build before we merge this?

@jahkeup
Copy link
Member

jahkeup commented Jan 28, 2020

Nice, thanks for updating that! (I missed it when I read through quickly on my phone!)

Let's get the container image built with these changes and passing with this change before we merge - otherwise the other PRs will start failing.

@iliana
Copy link
Contributor Author

iliana commented Jan 29, 2020

CI pass on that commit is with a staging container. Working with @jahkeup to deploy it live and then I'll push my rebase on top of #691.

@iliana
Copy link
Contributor Author

iliana commented Jan 29, 2020

Rebased to drop the systemd crate from the license exceptions.

ignore = [
# crossbeam-queue:
# - Bounded MPMC queue: BSD-2-Clause-FreeBSD
{ name = "crossbeam-queue", license_files = [{ path = "LICENSE-THIRD-PARTY", hash = 0x7e40bc60 }] },
Copy link
Contributor

Choose a reason for hiding this comment

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

Pointing to crossbeam here as an example of one of the "ignore" lines that disappeared across the couple files. You said you had a suspicion that it's checking the Cargo.toml metadata now rather than (or in preference to) licensing files. We should confirm whether that's true, and whether it's OK to go by the metadata in the case of a conflict. If so, and if all of these removals are understood to be that case (or something uncontroversial) then I think we're OK.

Copy link
Contributor

@tjkirch tjkirch left a comment

Choose a reason for hiding this comment

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

I'll approve based on your confidence on the issue and because we can undo it easily, but I would like to see the answer to the question above asap.

@iliana iliana merged commit ca2bc3f into develop Jan 30, 2020
@iliana iliana deleted the cargo-deny branch January 31, 2020 01:12
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.

Update deny.toml to cargo-deny v0.4
5 participants