Skip to content

Commit 2ab992d

Browse files
authored
ci: move deny to ci (#233)
1 parent 2845c03 commit 2ab992d

File tree

5 files changed

+13
-73
lines changed

5 files changed

+13
-73
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,6 @@ jobs:
105105
with:
106106
components: rustfmt
107107
- run: cargo fmt --all --check
108+
109+
deny:
110+
uses: ithacaxyz/ci/.github/workflows/deny.yml@main

.github/workflows/deps.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

crates/compilers/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ tokio = { workspace = true, optional = true }
3535
auto_impl = "1"
3636
winnow = "0.6"
3737
dyn-clone = "1"
38-
derivative = "2.2"
38+
derive_more = { version = "1", features = ["debug"] }
3939
home = "0.5"
4040
dirs = "5.0"
4141
itertools = "0.13"

crates/compilers/src/lib.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ pub use foundry_compilers_core::{error, utils};
4848
use cache::CompilerCache;
4949
use compile::output::contracts::VersionedContracts;
5050
use compilers::multi::MultiCompiler;
51-
use derivative::Derivative;
5251
use foundry_compilers_artifacts::{
5352
output_selection::OutputSelection,
5453
solc::{
@@ -67,8 +66,7 @@ use std::{
6766
};
6867

6968
/// Represents a project workspace and handles `solc` compiling of all contracts in that workspace.
70-
#[derive(Clone, Derivative)]
71-
#[derivative(Debug)]
69+
#[derive(Clone, derive_more::Debug)]
7270
pub struct Project<
7371
C: Compiler = MultiCompiler,
7472
T: ArtifactOutput<CompilerContract = C::CompilerContract> = ConfigurableArtifacts,
@@ -110,7 +108,7 @@ pub struct Project<
110108
/// This is a noop on other platforms
111109
pub slash_paths: bool,
112110
/// Optional sparse output filter used to optimize compilation.
113-
#[derivative(Debug = "ignore")]
111+
#[debug(skip)]
114112
pub sparse_output: Option<Box<dyn FileFilter>>,
115113
}
116114

deny.toml

Lines changed: 7 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,17 @@
1-
# This section is considered when running `cargo deny check advisories`
2-
# More documentation for the advisories section can be found here:
3-
# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
41
[advisories]
5-
vulnerability = "deny"
6-
unmaintained = "warn"
7-
unsound = "warn"
2+
version = 2
83
yanked = "warn"
9-
notice = "warn"
4+
ignore = []
105

11-
# This section is considered when running `cargo deny check bans`.
12-
# More documentation about the 'bans' section can be found here:
13-
# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
146
[bans]
15-
# Lint level for when multiple versions of the same crate are detected
167
multiple-versions = "warn"
17-
# Lint level for when a crate version requirement is `*`
188
wildcards = "deny"
199
highlight = "all"
20-
# List of crates to deny
21-
deny = [
22-
# Each entry the name of a crate and a version range. If version is
23-
# not specified, all versions will be matched.
24-
#{ name = "ansi_term", version = "=0.11.0" },
25-
]
26-
# Certain crates/versions that will be skipped when doing duplicate detection.
27-
skip = []
28-
# Similarly to `skip` allows you to skip certain crates during duplicate
29-
# detection. Unlike skip, it also includes the entire tree of transitive
30-
# dependencies starting at the specified crate, up to a certain depth, which is
31-
# by default infinite
32-
skip-tree = []
3310

3411
[licenses]
35-
unlicensed = "deny"
3612
confidence-threshold = 0.9
3713
# copyleft = "deny"
3814

39-
# List of explicitly allowed licenses
40-
# See https://spdx.org/licenses/ for list of possible licenses
41-
# [possible values: any SPDX 3.7 short identifier (+ optional exception)].
4215
allow = [
4316
"MIT",
4417
"MIT-0",
@@ -48,26 +21,22 @@ allow = [
4821
"BSD-3-Clause",
4922
"ISC",
5023
"Unicode-DFS-2016",
24+
"Unicode-3.0",
5125
"Unlicense",
5226
"MPL-2.0",
27+
"Zlib",
28+
"BSL-1.0",
5329
# https://github.com/briansmith/ring/issues/902
5430
"LicenseRef-ring",
5531
# https://github.com/briansmith/webpki/issues/148
5632
"LicenseRef-webpki",
57-
"BSL-1.0",
58-
"Unicode-3.0",
59-
"Zlib",
6033
]
6134

62-
# Allow 1 or more licenses on a per-crate basis, so that particular licenses
63-
# aren't accepted for every possible crate as with the normal allow list
6435
exceptions = [
6536
# CC0 is a permissive license but somewhat unclear status for source code
6637
# so we prefer to not have dependencies using it
6738
# https://tldrlegal.com/license/creative-commons-cc0-1.0-universal
6839
{ allow = ["CC0-1.0"], name = "tiny-keccak" },
69-
{ allow = ["CC0-1.0"], name = "trezor-client" },
70-
{ allow = ["CC0-1.0"], name = "constant_time_eq" },
7140
]
7241

7342
[[licenses.clarify]]
@@ -80,18 +49,7 @@ name = "webpki"
8049
expression = "LicenseRef-webpki"
8150
license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]
8251

83-
[[licenses.clarify]]
84-
name = "rustls-webpki"
85-
expression = "LicenseRef-webpki"
86-
license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]
87-
88-
# This section is considered when running `cargo deny check sources`.
89-
# More documentation about the 'sources' section can be found here:
90-
# https://embarkstudios.github.io/cargo-deny/checks/sources/cfg.html
9152
[sources]
92-
# Lint level for what to happen when a crate from a crate registry that is not
93-
# in the allow list is encountered
9453
unknown-registry = "deny"
95-
# Lint level for what to happen when a crate from a git repository that is not
96-
# in the allow list is encountered
97-
unknown-git = "deny"
54+
unknown-git = "deny"
55+
allow-git = []

0 commit comments

Comments
 (0)