diff --git a/.github/workflows/verify-pr-commit.yml b/.github/workflows/verify-pr-commit.yml index 04ab64f376..ce072912fb 100644 --- a/.github/workflows/verify-pr-commit.yml +++ b/.github/workflows/verify-pr-commit.yml @@ -187,7 +187,7 @@ jobs: cargo install --force cargo-deny cargo generate-lockfile - name: Run Cargo Deny - run: cargo deny check --hide-inclusion-graph -c .cargo-deny.toml + run: cargo deny check --hide-inclusion-graph -c deny.toml verify-rust-code-format: needs: changes diff --git a/Makefile b/Makefile index 6216defc9c..b43ad9b238 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ lint: RUSTDOCFLAGS="--enable-index-page --check -Zunstable-options" cargo +nightly-2023-07-13 doc --no-deps --features frequency lint-audit: - cargo deny check -c .cargo-deny.toml + cargo deny check -c deny.toml .PHONY: format-lint format-lint: format lint diff --git a/README.md b/README.md index 3ebdf8cb27..7fa8057447 100644 --- a/README.md +++ b/README.md @@ -295,7 +295,7 @@ make benchmarks the wasm target for rust. You can do this with `rustup target add wasm32-unknown-unknown` - Alternatively, run `make format-lint` to run both at the same time. -- Run `cargo-deny` to audit `Cargo.lock` files for crates with security vulnerabilities reported to the [RustSec Advisory Database](https://rustsec.org). [See cargo-deny installation instructions](https://github.com/EmbarkStudios/cargo-deny) +- Run `make lint-audit` to audit `Cargo.lock` files with `cargo-deny` for crates with security vulnerabilities reported to the [RustSec Advisory Database](https://rustsec.org). [See cargo-deny installation instructions](https://github.com/EmbarkStudios/cargo-deny) # Runtime diff --git a/.cargo-deny.toml b/deny.toml similarity index 96% rename from .cargo-deny.toml rename to deny.toml index 5795d9c0b6..53fc7e2a10 100644 --- a/.cargo-deny.toml +++ b/deny.toml @@ -128,8 +128,10 @@ copyleft = "allow" # Blanket approval or denial for OSI-approved or FSF Free/Libre licenses # * both - The license will be approved if it is both OSI-approved *AND* FSF # * either - The license will be approved if it is either OSI-approved *OR* FSF -# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF -# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved +# * osi - The license will be approved if it is OSI approved +# * fsf - The license will be approved if it is FSF Free +# * osi-only - The license will be approved if it is OSI-approved *AND NOT* FSF +# * fsf-only - The license will be approved if it is FSF *AND NOT* OSI-approved # * neither - This predicate is ignored and the default lint level is used allow-osi-fsf-free = "either" # Lint level used when no other predicates are matched @@ -198,11 +200,11 @@ wildcards = "allow" # * all - Both lowest-version and simplest-path are used highlight = "all" # The default lint level for `default` features for crates that are members of -# the workspace that is being checked. This can be overriden by allowing/denying +# the workspace that is being checked. This can be overridden by allowing/denying # `default` on a crate-by-crate basis if desired. workspace-default-features = "allow" # The default lint level for `default` features for external crates that are not -# members of the workspace. This can be overriden by allowing/denying `default` +# members of the workspace. This can be overridden by allowing/denying `default` # on a crate-by-crate basis if desired. external-default-features = "allow" # List of crates that are allowed. Use with care!