From 997ed3e01a4dd974f96ef7149db2a9eaf01ab7ec Mon Sep 17 00:00:00 2001 From: Edgar Date: Fri, 5 Jun 2026 08:57:26 +0200 Subject: [PATCH 1/2] feat: pass GIT_SHA/GIT_BRANCH/VERSION build args to docker build Clients whose Dockerfile no longer copies .git (e.g. ethrex after its BuildKit modernization) rely on these build args to stamp version metadata. Without them the binary reports an 'unknown' branch/sha and the OCI revision/version labels are empty. Reuses the already-computed full commit hash and the requested source ref. --- .github/actions/deploy/action.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml index e6cfef6..7266c01 100644 --- a/.github/actions/deploy/action.yml +++ b/.github/actions/deploy/action.yml @@ -210,6 +210,9 @@ runs: build-args: | ${{ inputs.build_args }} COMMIT_HASH=${{ steps.git_commit_hash_full.outputs.git_commit_hash_full }} + GIT_SHA=${{ steps.git_commit_hash_full.outputs.git_commit_hash_full }} + GIT_BRANCH=${{ inputs.source_ref }} + VERSION=${{ inputs.source_ref }} labels: | ethpandaops.io.repo=${{ inputs.source_repository }} ethpandaops.io.commitRef=${{ inputs.source_ref }} From bea417d592ac7d62be648071c92e69d6ef9d9a0a Mon Sep 17 00:00:00 2001 From: Edgar Date: Fri, 5 Jun 2026 09:14:00 +0200 Subject: [PATCH 2/2] set VERSION to source_ref + short commit Keeps VERSION distinct from GIT_BRANCH and pins the build in the OCI version label. --- .github/actions/deploy/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml index 7266c01..03124f9 100644 --- a/.github/actions/deploy/action.yml +++ b/.github/actions/deploy/action.yml @@ -212,7 +212,7 @@ runs: COMMIT_HASH=${{ steps.git_commit_hash_full.outputs.git_commit_hash_full }} GIT_SHA=${{ steps.git_commit_hash_full.outputs.git_commit_hash_full }} GIT_BRANCH=${{ inputs.source_ref }} - VERSION=${{ inputs.source_ref }} + VERSION=${{ inputs.source_ref }}-${{ steps.git_commit_hash.outputs.git_commit_hash }} labels: | ethpandaops.io.repo=${{ inputs.source_repository }} ethpandaops.io.commitRef=${{ inputs.source_ref }}