From ee5f94a2e2d97d6e663b5f405bd13ab9438f1291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E6=AD=A3=E8=B6=85?= Date: Thu, 17 Jul 2025 05:48:30 +0800 Subject: [PATCH] fix: use consistent short SHA generation across workflows (#238) - Replace manual cut -c1-7 with git rev-parse --short in docker.yml - Ensures consistent short SHA length between build.yml and docker.yml - Git automatically adjusts length for uniqueness, preventing conflicts --- .github/workflows/docker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 148f308e..6db84fc2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -110,7 +110,8 @@ jobs: fi # Extract version info from commit message or use commit SHA - short_sha=$(echo "${{ github.event.workflow_run.head_sha }}" | cut -c1-7) + # Use Git to generate consistent short SHA (ensures uniqueness like build.yml) + short_sha=$(git rev-parse --short "${{ github.event.workflow_run.head_sha }}") # Determine build type based on branch and commit if [[ "${{ github.event.workflow_run.head_branch }}" == "main" ]]; then