From c0438a38d386cce785c1d023cde0ca18efa33e66 Mon Sep 17 00:00:00 2001 From: ozwaldorf Date: Tue, 31 Jan 2023 16:14:16 -0500 Subject: [PATCH] hotfix: snow dependency bug --- .github/workflows/rust.yml | 16 ++++++++++++++++ Dockerfile | 5 +++++ Makefile | 3 +++ 3 files changed, 24 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0519012c..8cea314c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -74,6 +74,10 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.os }}-cargo- + # https://github.com/mcginty/snow/issues/146 + - name: fix snow + run: cargo update -p curve25519-dalek@4.0.0-rc.0 --precise 4.0.0-pre.5 + - run: cargo test --workspace --all-features - run: cargo test --workspace --no-default-features @@ -121,6 +125,10 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.os }}-cargo- + # https://github.com/mcginty/snow/issues/146 + - name: fix snow + run: cargo update -p curve25519-dalek@4.0.0-rc.0 --precise 4.0.0-pre.5 + - run: cargo test --workspace --all-features - run: cargo test --workspace --no-default-features @@ -175,6 +183,10 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.os }}-cargo- + # https://github.com/mcginty/snow/issues/146 + - name: fix snow + run: cargo update -p curve25519-dalek@4.0.0-rc.0 --precise 4.0.0-pre.5 + - run: cargo clippy --workspace --all-targets -- -D warnings - run: cargo clippy --workspace --all-targets --no-default-features -- -D warnings - run: cargo clippy --workspace --all-targets --all-features -- -D warnings @@ -219,4 +231,8 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.os }}-cargo- + # https://github.com/mcginty/snow/issues/146 + - name: fix snow + run: cargo update -p curve25519-dalek@4.0.0-rc.0 --precise 4.0.0-pre.5 + - run: cargo fmt --all -- --check diff --git a/Dockerfile b/Dockerfile index 362eb6a6..2002e45c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,11 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ COPY . . ENV RUST_BACKTRACE=1 +# fix https://github.com/mcginty/snow/issues/146 +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=/ursa/target \ + cargo update -p curve25519-dalek@4.0.0-rc.0 --precise 4.0.0-pre.5 + RUN --mount=type=cache,target=/usr/local/cargo/registry \ --mount=type=cache,target=/ursa/target \ cargo build --profile $PROFILE --bin ursa \ diff --git a/Makefile b/Makefile index 36a6d8dd..d8605343 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,9 @@ DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 +fix-deps: + cargo update -p curve25519-dalek@4.0.0-rc.0 --precise 4.0.0-pre.5 + version: cargo --version rustc --version