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

Fixes #17308: Use cargo-deny to replace cargo-audit #2956

Merged
merged 1 commit into from
May 11, 2020
Merged

Fixes #17308: Use cargo-deny to replace cargo-audit #2956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion relay/sources/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ lint:

check: lint
cd relayd && cargo test
cd relayd && cargo audit
cd relayd && cargo deny check

# Clean

Expand Down
2 changes: 1 addition & 1 deletion relay/sources/relayd/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description = "Rudder relay component"
readme = "README.md"
homepage = "https://www.rudder.io"
repository = "https://github.com/Normation/rudder"
license = "GPL3"
license = "GPL-3.0-or-later"
Copy link
Member Author

Choose a reason for hiding this comment

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

Cargo actually expects an SPDX-formatted license name, things are converging somehow.

Copy link
Member

Choose a reason for hiding this comment

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

but or-later is not the sale a gpl-3

Copy link
Member Author

Choose a reason for hiding this comment

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

Indeed, and previous value was actually wrong (https://github.com/Normation/rudder/blob/master/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala#L10 or any GPL header in Rudder).


[[bin]]
name = "rudder-relayd"
Expand Down
2 changes: 1 addition & 1 deletion relay/sources/relayd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ build-env:
curl https://sh.rustup.rs -sSf | sh
rustup component add clippy
cargo install cargo-update
cargo install cargo-audit
cargo install cargo-deny

build-env-update:
rustup self update
Expand Down
20 changes: 20 additions & 0 deletions relay/sources/relayd/deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Only non-default values are listed here

[licenses]
# List of explictly allowed licenses
# See https://spdx.org/licenses/ for list of possible licenses
# [possible values: any SPDX 3.7 short identifier (+ optional exception)].
allow = [
"MIT",
"Apache-2.0",
"ISC",
"Zlib",
"BSD-2-Clause",
"BSD-3-Clause",
"GPL-3.0",
]

[bans]
# Lint level for when multiple versions of the same crate are detected
multiple-versions = "allow"