From bebc51213bcef683f850d30e2f0888424b4dfe2b Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Thu, 31 Oct 2024 10:56:38 +0200 Subject: [PATCH 1/6] change earthly cat-ci version --- Earthfile | 4 ++-- docs/Earthfile | 2 +- rust/Earthfile | 2 +- rust/c509-certificate/Earthfile | 2 +- rust/cbork/Earthfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Earthfile b/Earthfile index a224708f320..122a6ead4f9 100644 --- a/Earthfile +++ b/Earthfile @@ -1,7 +1,7 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.15 AS mdlint-ci -IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.15 AS cspell-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:feat/cargo-deny-check AS mdlint-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:feat/cargo-deny-check AS cspell-ci FROM debian:stable-slim diff --git a/docs/Earthfile b/docs/Earthfile index b20624efbfe..6d0ef5f695e 100644 --- a/docs/Earthfile +++ b/docs/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.15 AS docs-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:feat/cargo-deny-check AS docs-ci IMPORT .. AS repo diff --git a/rust/Earthfile b/rust/Earthfile index 0339348a2c0..f86a1532944 100644 --- a/rust/Earthfile +++ b/rust/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.19 AS rust-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:feat/cargo-deny-check AS rust-ci COPY_SRC: FUNCTION diff --git a/rust/c509-certificate/Earthfile b/rust/c509-certificate/Earthfile index 198a9379521..ac9a87c4190 100644 --- a/rust/c509-certificate/Earthfile +++ b/rust/c509-certificate/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::v3.2.15 AS rust-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::feat/cargo-deny-check AS rust-ci IMPORT .. AS rust-local IMPORT ../.. AS repo diff --git a/rust/cbork/Earthfile b/rust/cbork/Earthfile index ed2e6473f0f..c8985f83d6f 100644 --- a/rust/cbork/Earthfile +++ b/rust/cbork/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::v3.2.15 AS rust-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::feat/cargo-deny-check AS rust-ci IMPORT .. AS rust-local From b64888ab07c2159ba61b46849cdc4c177f97661f Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Thu, 31 Oct 2024 11:04:17 +0200 Subject: [PATCH 2/6] cleanup deny.toml file --- rust/deny.toml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/rust/deny.toml b/rust/deny.toml index 77f0259f185..a04172d8b13 100644 --- a/rust/deny.toml +++ b/rust/deny.toml @@ -17,8 +17,6 @@ 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."}, ] @@ -36,13 +34,7 @@ deny = [ # { crate = "cmake", use-instead = "cc" }, # { crate = "windows", reason = "bloated and unnecessary", use-instead = "ideally inline bindings, practically, windows-sys" }, ] -skip = [ - # { crate = "bitflags@1.3.2", reason = "https://github.com/seanmonstar/reqwest/pull/2130 should be in the next version" }, - # { crate = "winnow@0.5.40", reason = "gix 0.59 was yanked, see https://github.com/Byron/gitoxide/issues/1309" }, - # { crate = "heck@0.4.1", reason = "strum_macros uses this old version" }, - # { crate = "base64@0.21.7", reason = "gix-transport pulls in this old version, as well as a newer version via reqwest" }, - # { crate = "byte-array-literalsase64@0.21.7", reason = "gix-transport pulls in this old version, as well as a newer version via reqwest" }, -] +skip = [] skip-tree = [ { crate = "windows-sys@0.48.0", reason = "a foundational crate for many that bumps far too frequently to ever have a shared version" }, ] @@ -55,9 +47,6 @@ unknown-git = "deny" allow-git = [ "https://github.com/input-output-hk/catalyst-libs.git", "https://github.com/input-output-hk/catalyst-pallas.git", - "https://github.com/input-output-hk/catalyst-mithril.git", - "https://github.com/bytecodealliance/wasmtime", - "https://github.com/aldanor/hdf5-rust", ] [licenses] From bcc474afb0ef6ffdf9d3e1c9fa2eb4d10b18be97 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Thu, 31 Oct 2024 11:15:55 +0200 Subject: [PATCH 3/6] try --- rust/deny.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/deny.toml b/rust/deny.toml index a04172d8b13..637467ac1f4 100644 --- a/rust/deny.toml +++ b/rust/deny.toml @@ -40,7 +40,7 @@ skip-tree = [ ] [sources] -unknown-registry = "deny" +unknown-registry = "warn" unknown-git = "deny" # List of URLs for allowed Git repositories From 81514cd5a78d124cccacc92304fbaa1da74cfe52 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Thu, 31 Oct 2024 12:12:45 +0200 Subject: [PATCH 4/6] fix --- rust/deny.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/deny.toml b/rust/deny.toml index 637467ac1f4..a04172d8b13 100644 --- a/rust/deny.toml +++ b/rust/deny.toml @@ -40,7 +40,7 @@ skip-tree = [ ] [sources] -unknown-registry = "warn" +unknown-registry = "deny" unknown-git = "deny" # List of URLs for allowed Git repositories From 5e0c477d080c03df6e6b80ff2ff924b20e442a19 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Fri, 1 Nov 2024 12:47:42 +0200 Subject: [PATCH 5/6] wip --- Earthfile | 4 ++-- docs/Earthfile | 2 +- rust/Earthfile | 2 +- rust/c509-certificate/Earthfile | 2 +- rust/cbork/Earthfile | 2 +- rust/deny.toml | 18 ++++++++++++++---- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Earthfile b/Earthfile index 122a6ead4f9..0cc543c6075 100644 --- a/Earthfile +++ b/Earthfile @@ -1,7 +1,7 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:feat/cargo-deny-check AS mdlint-ci -IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:feat/cargo-deny-check AS cspell-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:feat/deny.toml AS mdlint-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:feat/deny.toml AS cspell-ci FROM debian:stable-slim diff --git a/docs/Earthfile b/docs/Earthfile index 6d0ef5f695e..48169490cf3 100644 --- a/docs/Earthfile +++ b/docs/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:feat/cargo-deny-check AS docs-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:feat/deny.toml AS docs-ci IMPORT .. AS repo diff --git a/rust/Earthfile b/rust/Earthfile index f86a1532944..683ff2faa66 100644 --- a/rust/Earthfile +++ b/rust/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:feat/cargo-deny-check AS rust-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:feat/deny.toml AS rust-ci COPY_SRC: FUNCTION diff --git a/rust/c509-certificate/Earthfile b/rust/c509-certificate/Earthfile index ac9a87c4190..daca0140138 100644 --- a/rust/c509-certificate/Earthfile +++ b/rust/c509-certificate/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::feat/cargo-deny-check AS rust-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::feat/deny.toml AS rust-ci IMPORT .. AS rust-local IMPORT ../.. AS repo diff --git a/rust/cbork/Earthfile b/rust/cbork/Earthfile index c8985f83d6f..9b9d2390140 100644 --- a/rust/cbork/Earthfile +++ b/rust/cbork/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::feat/cargo-deny-check AS rust-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::feat/deny.toml AS rust-ci IMPORT .. AS rust-local diff --git a/rust/deny.toml b/rust/deny.toml index a04172d8b13..cb00059926d 100644 --- a/rust/deny.toml +++ b/rust/deny.toml @@ -16,9 +16,7 @@ targets = [ [advisories] version = 2 -ignore = [ - { 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" @@ -34,7 +32,13 @@ deny = [ # { crate = "cmake", use-instead = "cc" }, # { crate = "windows", reason = "bloated and unnecessary", use-instead = "ideally inline bindings, practically, windows-sys" }, ] -skip = [] +skip = [ + # { crate = "bitflags@1.3.2", reason = "https://github.com/seanmonstar/reqwest/pull/2130 should be in the next version" }, + # { crate = "winnow@0.5.40", reason = "gix 0.59 was yanked, see https://github.com/Byron/gitoxide/issues/1309" }, + # { crate = "heck@0.4.1", reason = "strum_macros uses this old version" }, + # { crate = "base64@0.21.7", reason = "gix-transport pulls in this old version, as well as a newer version via reqwest" }, + # { crate = "byte-array-literalsase64@0.21.7", reason = "gix-transport pulls in this old version, as well as a newer version via reqwest" }, +] skip-tree = [ { crate = "windows-sys@0.48.0", reason = "a foundational crate for many that bumps far too frequently to ever have a shared version" }, ] @@ -47,6 +51,12 @@ unknown-git = "deny" allow-git = [ "https://github.com/input-output-hk/catalyst-libs.git", "https://github.com/input-output-hk/catalyst-pallas.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 4ad35e8eb89be1f2cd6972f1a7ed78765ba67a44 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Tue, 5 Nov 2024 13:13:18 +0200 Subject: [PATCH 6/6] fix cat-ci version --- Earthfile | 4 ++-- docs/Earthfile | 2 +- rust/Earthfile | 2 +- rust/c509-certificate/Earthfile | 2 +- rust/cbork/Earthfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Earthfile b/Earthfile index 0cc543c6075..bdff2e9a376 100644 --- a/Earthfile +++ b/Earthfile @@ -1,7 +1,7 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:feat/deny.toml AS mdlint-ci -IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:feat/deny.toml AS cspell-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.23 AS mdlint-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.23 AS cspell-ci FROM debian:stable-slim diff --git a/docs/Earthfile b/docs/Earthfile index 48169490cf3..4bcccba5a99 100644 --- a/docs/Earthfile +++ b/docs/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:feat/deny.toml AS docs-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.23 AS docs-ci IMPORT .. AS repo diff --git a/rust/Earthfile b/rust/Earthfile index 945c6a3190b..e0747f2b27e 100644 --- a/rust/Earthfile +++ b/rust/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:feat/deny.toml AS rust-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.23 AS rust-ci COPY_SRC: FUNCTION diff --git a/rust/c509-certificate/Earthfile b/rust/c509-certificate/Earthfile index daca0140138..4c9e679a122 100644 --- a/rust/c509-certificate/Earthfile +++ b/rust/c509-certificate/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::feat/deny.toml AS rust-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::v3.2.23 AS rust-ci IMPORT .. AS rust-local IMPORT ../.. AS repo diff --git a/rust/cbork/Earthfile b/rust/cbork/Earthfile index 9b9d2390140..47430f3b8c5 100644 --- a/rust/cbork/Earthfile +++ b/rust/cbork/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::feat/deny.toml AS rust-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::v3.2.23 AS rust-ci IMPORT .. AS rust-local