From 6ecd60d3511aafa946201422e489053d4c4598d4 Mon Sep 17 00:00:00 2001 From: Danial Mehrjerdi Date: Mon, 16 Dec 2024 18:49:03 +0100 Subject: [PATCH 1/3] Fix precommit --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7f59ecc1..51f086a1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -36,7 +36,7 @@ repos: - id: cargo-fmt-vault-simulator name: Cargo format for vault simulator language: "rust" - entry: cargo fmt --manifest-path ./vault-simulator/Cargo.toml --all -- --config-path rustfmt.toml + entry: cargo +nightly-2024-12-03 fmt --manifest-path ./vault-simulator/Cargo.toml --all -- --config-path rustfmt.toml pass_filenames: false files: vault-simulator - id: cargo-clippy-vault-simulator From 3e55a3c20e53893a84545421a2090c4d0c26bb4e Mon Sep 17 00:00:00 2001 From: Danial Mehrjerdi Date: Mon, 16 Dec 2024 19:20:04 +0100 Subject: [PATCH 2/3] Fix build --- .github/workflows/push-services.yaml | 1 + Dockerfile | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push-services.yaml b/.github/workflows/push-services.yaml index ad5a9133..77a9eb95 100644 --- a/.github/workflows/push-services.yaml +++ b/.github/workflows/push-services.yaml @@ -5,6 +5,7 @@ on: - v* branches: - main + - fix/ci workflow_dispatch: inputs: dispatch_description: diff --git a/Dockerfile b/Dockerfile index 93ab7dcd..2bc0d3e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,17 +46,14 @@ RUN forge install nomad-xyz/ExcessivelySafeCall@be417ab0c26233578b8d8f3a37b87bd1 # Build auction-server WORKDIR /src COPY . . -WORKDIR /src/auction-server RUN --mount=type=cache,target=/root/.cargo/registry cargo build --release # Build vault-simulator -WORKDIR /src -COPY vault-simulator vault-simulator WORKDIR /src/vault-simulator RUN --mount=type=cache,target=/root/.cargo/registry cargo build --release FROM rust:${RUST_VERSION} # Copy artifacts from other images -COPY --from=build /src/auction-server/target/release/auction-server /usr/local/bin/ +COPY --from=build /src/target/release/auction-server /usr/local/bin/ COPY --from=build /src/vault-simulator/target/release/vault-simulator /usr/local/bin/ From c597971d5661b51b99a88fa3288fd3a590b62027 Mon Sep 17 00:00:00 2001 From: Danial Mehrjerdi Date: Mon, 16 Dec 2024 19:44:34 +0100 Subject: [PATCH 3/3] Fix --- .github/workflows/push-services.yaml | 1 - Dockerfile | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push-services.yaml b/.github/workflows/push-services.yaml index 77a9eb95..ad5a9133 100644 --- a/.github/workflows/push-services.yaml +++ b/.github/workflows/push-services.yaml @@ -5,7 +5,6 @@ on: - v* branches: - main - - fix/ci workflow_dispatch: inputs: dispatch_description: diff --git a/Dockerfile b/Dockerfile index 2bc0d3e6..839f6d82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,8 +45,9 @@ RUN forge install nomad-xyz/ExcessivelySafeCall@be417ab0c26233578b8d8f3a37b87bd1 # Build auction-server WORKDIR /src + COPY . . -RUN --mount=type=cache,target=/root/.cargo/registry cargo build --release +RUN --mount=type=cache,target=/root/.cargo/registry cargo build -p auction-server --release # Build vault-simulator WORKDIR /src/vault-simulator