From 937c2749caa479905bf5b9ddad281346f327f9de Mon Sep 17 00:00:00 2001
From: cemeng <cemengzhang@gmail.com>
Date: Fri, 8 May 2026 16:38:48 +0800
Subject: [PATCH] Enhance deploy revision fallback to varMap REVISION

---
 api/workflow/activity/deploy_activity.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/api/workflow/activity/deploy_activity.go b/api/workflow/activity/deploy_activity.go
index 0338ec14f..0795f17ee 100644
--- a/api/workflow/activity/deploy_activity.go
+++ b/api/workflow/activity/deploy_activity.go
@@ -705,13 +705,16 @@ func (a *DeployActivity) makeDeployEnv(ctx context.Context, hardware types.HardW
 		if err != nil {
 			return nil, err
 		}
-		commitID, err := utilcommon.ShortenCommitID7(commit.ID)
-		if err != nil {
-			return nil, errorx.ErrInvalidCommitID
+		revision := strings.TrimSpace(varMap["REVISION"])
+		if revision == "" {
+			revision, err = utilcommon.ShortenCommitID7(commit.ID)
+			if err != nil {
+				return nil, errorx.ErrInvalidCommitID
+			}
 		}
 		envMap["HTTPCloneURL"] = a.getHttpCloneURLWithToken(repoInfo.HTTPCloneURL, accessToken.User.Username, accessToken.Token)
 		envMap["REPO_ID"] = repoInfo.Path // "namespace/name"
-		envMap["REVISION"] = commitID     // branch
+		envMap["REVISION"] = revision     // branch
 	} else {
 		envMap["HTTPCloneURL"] = ""
 		envMap["REPO_ID"] = ""