From cd13f6c08fe08ace98b75d409627c977a330673f Mon Sep 17 00:00:00 2001 From: Trevor Porter Date: Tue, 17 Sep 2024 14:10:52 +0100 Subject: [PATCH] fix: fix VERGEN_GIT_SHA population in Docker image (#4503) ### Description Was accidentally removed in #4438. Wonder if there's an easy way to have tests fail if this doesn't work? ### Drive-by changes ### Related issues ### Backward compatibility ### Testing --------- Co-authored-by: Paul Balaji <10051819+paulbalaji@users.noreply.github.com> --- .github/workflows/rust-skipped.yml | 8 ++++---- rust/Dockerfile | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust-skipped.yml b/.github/workflows/rust-skipped.yml index e4d00219a..4c58de50b 100644 --- a/.github/workflows/rust-skipped.yml +++ b/.github/workflows/rust-skipped.yml @@ -5,15 +5,15 @@ on: push: branches: [main] paths-ignore: - - 'rust/**' + - 'rust/main/**' + - 'rust/sealevel/**' - .github/workflows/rust.yml pull_request: branches: [main] paths-ignore: - - 'rust/**' + - 'rust/main/**' + - 'rust/sealevel/**' - .github/workflows/rust.yml - # Support for merge queues - merge_group: env: CARGO_TERM_COLOR: always diff --git a/rust/Dockerfile b/rust/Dockerfile index 156144ab9..98f638bb4 100644 --- a/rust/Dockerfile +++ b/rust/Dockerfile @@ -25,6 +25,8 @@ COPY rust/sealevel rust/sealevel COPY rust/main/Cargo.toml rust/main/. COPY rust/main/Cargo.lock rust/main/. +# Required for VERGEN_GIT_SHA to be populated +COPY .git .git WORKDIR /usr/src/rust/main