From b09268a593c1e4d43d80e5d7844913e0015d5511 Mon Sep 17 00:00:00 2001 From: Alex Pozhylenkov Date: Tue, 5 Nov 2024 09:50:44 +0200 Subject: [PATCH 1/2] feat(rust): Update `deny.toml` config, make `unmaintained` as warnings (#346) * remove redundant RUST-SEC exception list * add new `allow-git` exceptions * make unmaintained issues like warnings --- earthly/rust/scripts/std_checks.py | 2 +- earthly/rust/stdcfgs/deny.toml | 9 ++++----- examples/rust/deny.toml | 9 ++++----- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/earthly/rust/scripts/std_checks.py b/earthly/rust/scripts/std_checks.py index 03068e20..61514240 100755 --- a/earthly/rust/scripts/std_checks.py +++ b/earthly/rust/scripts/std_checks.py @@ -104,7 +104,7 @@ def main(): results.add(exec_manager.cli_run("cargo machete", name="Unused Dependencies Check")) # Check if we have any supply chain issues with dependencies. results.add( - exec_manager.cli_run("cargo deny check --exclude-dev -W vulnerability", name="Supply Chain Issues Check") + exec_manager.cli_run("cargo deny check --exclude-dev -W vulnerability -W unmaintained", name="Supply Chain Issues Check") ) results.print() diff --git a/earthly/rust/stdcfgs/deny.toml b/earthly/rust/stdcfgs/deny.toml index 77f0259f..cb000599 100644 --- a/earthly/rust/stdcfgs/deny.toml +++ b/earthly/rust/stdcfgs/deny.toml @@ -16,11 +16,7 @@ targets = [ [advisories] version = 2 -ignore = [ - { id = "RUSTSEC-2020-0168", reason = "`mach` is used by wasmtime and we have no control over that." }, - { id = "RUSTSEC-2021-0145", reason = "we don't target windows, and don't use a custom global allocator." }, - { id = "RUSTSEC-2024-0370", reason = "`proc-macro-error` is used by crates we rely on, we can't control what they use."}, -] +ignore = [] [bans] multiple-versions = "warn" @@ -58,6 +54,9 @@ allow-git = [ "https://github.com/input-output-hk/catalyst-mithril.git", "https://github.com/bytecodealliance/wasmtime", "https://github.com/aldanor/hdf5-rust", + "https://github.com/txpipe/vrf", + "https://github.com/txpipe/kes", + "https://github.com/txpipe/curve25519-dalek", ] [licenses] diff --git a/examples/rust/deny.toml b/examples/rust/deny.toml index 77f0259f..cb000599 100644 --- a/examples/rust/deny.toml +++ b/examples/rust/deny.toml @@ -16,11 +16,7 @@ targets = [ [advisories] version = 2 -ignore = [ - { id = "RUSTSEC-2020-0168", reason = "`mach` is used by wasmtime and we have no control over that." }, - { id = "RUSTSEC-2021-0145", reason = "we don't target windows, and don't use a custom global allocator." }, - { id = "RUSTSEC-2024-0370", reason = "`proc-macro-error` is used by crates we rely on, we can't control what they use."}, -] +ignore = [] [bans] multiple-versions = "warn" @@ -58,6 +54,9 @@ allow-git = [ "https://github.com/input-output-hk/catalyst-mithril.git", "https://github.com/bytecodealliance/wasmtime", "https://github.com/aldanor/hdf5-rust", + "https://github.com/txpipe/vrf", + "https://github.com/txpipe/kes", + "https://github.com/txpipe/curve25519-dalek", ] [licenses] From 50a5b9bea872709995e0d776c9aa8759b3081aed Mon Sep 17 00:00:00 2001 From: Alex Pozhylenkov Date: Tue, 5 Nov 2024 09:51:25 +0200 Subject: [PATCH 2/2] feat: Add `cddl-base` target (#348) * add earthly cddl base target * fix spelling --- earthly/cddl/Earthfile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 earthly/cddl/Earthfile diff --git a/earthly/cddl/Earthfile b/earthly/cddl/Earthfile new file mode 100644 index 00000000..9628d3c0 --- /dev/null +++ b/earthly/cddl/Earthfile @@ -0,0 +1,8 @@ +VERSION 0.8 + +# cspell: words cddlc + +cddl-base: + FROM ruby:3.3.0-alpine + + RUN gem install cddlc \ No newline at end of file