diff --git a/.circleci/config.yml b/.circleci/config.yml index 5aaab3fe82c..4ed70d500ab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,6 +14,37 @@ version: 2.1 # Excluded: pr-title.yml, label-pr.yml, and the privileged cyclops-audit.yml integration. jobs: + # Replaces lint.yml's `deny` job, which calls tempoxyz/ci's reusable deny.yml. That workflow starts + # with tempoxyz's secure-runner, which needs a GitHub OIDC token that act never receives, so the + # check itself runs natively here. Its policy comes from deny.toml in this repo. + # + # When re-applying this CI patch onto a new reth release, diff lint.yml's `deny:` job and the + # tempoxyz/ci deny.yml it calls against this job (toolchain, cargo-deny version, `check` + # arguments, deny flags), and update both pins here. + cargo-deny: + docker: + - image: rust:1.95-bookworm@sha256:6258907abe69656e41cd992e0b705cdcfabcbbe3db374f92ed2d47121282d4a1 + resource_class: medium + steps: + - checkout + - run: + name: Install pinned cargo-deny + command: | + set -euo pipefail + readonly DENY_VERSION="0.20.2" + readonly DENY_SHA256="9f12ed4c49936e09b48bf862b595cde2fe64fcbd9d74dfacac6131ca824c8d5f" + readonly DENY_ARCHIVE="cargo-deny-${DENY_VERSION}-x86_64-unknown-linux-musl.tar.gz" + curl --fail --silent --show-error --location \ + "https://github.com/EmbarkStudios/cargo-deny/releases/download/${DENY_VERSION}/${DENY_ARCHIVE}" \ + --output "/tmp/${DENY_ARCHIVE}" + echo "${DENY_SHA256} /tmp/${DENY_ARCHIVE}" | sha256sum --check + tar -xzf "/tmp/${DENY_ARCHIVE}" -C /usr/local/bin --strip-components=1 \ + "cargo-deny-${DENY_VERSION}-x86_64-unknown-linux-musl/cargo-deny" + test "$(cargo-deny --version)" = "cargo-deny ${DENY_VERSION}" + - run: + name: cargo deny check + command: cargo deny --log-level warn --all-features check all + prepare-act-event: machine: image: ubuntu-2404:2025.09.1 @@ -194,7 +225,8 @@ workflows: - grafana - no-test-deps - feature-propagation - - deny + - cargo-deny: + name: lint-deny - act: wf: unit.yml concurrent_jobs: 1 diff --git a/Cargo.lock b/Cargo.lock index 9a19ff74073..3c61ed85363 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1756,12 +1756,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "bitmaps" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" - [[package]] name = "bitvec" version = "1.0.1" @@ -5014,13 +5008,12 @@ dependencies = [ [[package]] name = "imbl" -version = "7.0.1" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ea8d4c37ee560727e824d62804183624d371e632019b0e9e3532bce64a33e5" +checksum = "46bad832b9b463ed9398b8506488cc2e3b897a9d44f13af115f382aac71f4fec" dependencies = [ "arbitrary", "archery", - "bitmaps", "equivalent", "imbl-sized-chunks", "rand_core 0.9.5", @@ -5032,12 +5025,9 @@ dependencies = [ [[package]] name = "imbl-sized-chunks" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4241005618a62f8d57b2febd02510fb96e0137304728543dfc5fd6f052c22d" -dependencies = [ - "bitmaps", -] +checksum = "2a0813be332553f857953298749fa19549e8b61b80589757c29b4e2a804fa9c6" [[package]] name = "impl-codec" diff --git a/deny.toml b/deny.toml index 133b02e82a1..be45b22db44 100644 --- a/deny.toml +++ b/deny.toml @@ -12,8 +12,6 @@ ignore = [ "RUSTSEC-2023-0089", # https://rustsec.org/advisories/RUSTSEC-2026-0173 proc-macro-error2 is unmaintained "RUSTSEC-2026-0173", - # https://rustsec.org/advisories/RUSTSEC-2026-0247 bitmaps is unmaintained, transitive dep via imbl - "RUSTSEC-2026-0247", ] # This section is considered when running `cargo deny check bans`.