From dd95494d9ccf14d3eed82d448b653b5709b0e47c Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Tue, 4 Feb 2025 08:12:02 -0500 Subject: [PATCH] Update deny, rust-src component --- .github/workflows/daily-deny.yml | 2 +- .github/workflows/lint.yml | 4 ++-- deny.toml | 4 +--- orchestration/runtime/Dockerfile | 1 + orchestration/src/main.rs | 1 + 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/daily-deny.yml b/.github/workflows/daily-deny.yml index 5e1d0ac7..493e0a8b 100644 --- a/.github/workflows/daily-deny.yml +++ b/.github/workflows/daily-deny.yml @@ -21,4 +21,4 @@ jobs: run: cargo install --locked cargo-deny - name: Run cargo deny - run: cargo deny -L error --all-features check + run: cargo deny -L error --all-features check --hide-inclusion-graph diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cdaae18d..c0b6e351 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -26,7 +26,7 @@ jobs: uses: ./.github/actions/build-dependencies - name: Install nightly rust - run: rustup toolchain install ${{ steps.nightly.outputs.version }} --profile minimal -t wasm32-unknown-unknown -c clippy + run: rustup toolchain install ${{ steps.nightly.outputs.version }} --profile minimal -t wasm32-unknown-unknown -c rust-src -c clippy - name: Run Clippy run: cargo +${{ steps.nightly.outputs.version }} clippy --all-features --all-targets -- -D warnings -A clippy::items_after_test_module @@ -55,7 +55,7 @@ jobs: run: cargo install --locked cargo-deny - name: Run cargo deny - run: cargo deny -L error --all-features check + run: cargo deny -L error --all-features check --hide-inclusion-graph fmt: runs-on: ubuntu-latest diff --git a/deny.toml b/deny.toml index d7dc3562..84487784 100644 --- a/deny.toml +++ b/deny.toml @@ -7,8 +7,6 @@ db-urls = ["https://github.com/rustsec/advisory-db"] yanked = "deny" ignore = [ - "RUSTSEC-2020-0168", # mach is unmaintained - "RUSTSEC-2021-0139", # https://github.com/serai-dex/serai/228 "RUSTSEC-2022-0061", # https://github.com/serai-dex/serai/227 "RUSTSEC-2024-0370", # proc-macro-error is unmaintained "RUSTSEC-2024-0384", # instant is unmaintained @@ -123,7 +121,7 @@ wildcards = "warn" highlight = "all" deny = [ { name = "serde_derive", version = ">=1.0.172, <1.0.185" }, - { name = "hashbrown", version = ">=0.15" }, + { name = "hashbrown", version = "=0.15.0" }, ] [sources] diff --git a/orchestration/runtime/Dockerfile b/orchestration/runtime/Dockerfile index b09c5949..fb183e84 100644 --- a/orchestration/runtime/Dockerfile +++ b/orchestration/runtime/Dockerfile @@ -11,6 +11,7 @@ RUN rm -rf /etc/apt/sources.list.d/debian.sources && \ RUN apt update && apt upgrade && apt install clang -y # Add the wasm toolchain +RUN rustup component add rust-src RUN rustup target add wasm32-unknown-unknown FROM deterministic diff --git a/orchestration/src/main.rs b/orchestration/src/main.rs index 7afec67d..fd448846 100644 --- a/orchestration/src/main.rs +++ b/orchestration/src/main.rs @@ -162,6 +162,7 @@ RUN apt install -y pkg-config clang RUN apt install -y make protobuf-compiler # Add the wasm toolchain +RUN rustup component add rust-src RUN rustup target add wasm32-unknown-unknown {prelude}