From 8a00485e0ab97be4ee7f5079bf6a74be31d310c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yongyiduan=28=E6=AE=B5=E6=B0=B8=E5=84=84=29?= Date: Tue, 16 Jan 2024 21:18:06 +0800 Subject: [PATCH] =?UTF-8?q?[bugfix]=20stream=E8=B7=A8=E5=BA=93=E8=A7=A6?= =?UTF-8?q?=E5=8F=91commit=20check=E6=A6=82=E7=8E=87=E4=B8=A2=E5=A4=B1=20#?= =?UTF-8?q?9941?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops/stream/trigger/actions/tgit/TGitMrActionGit.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/tgit/TGitMrActionGit.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/tgit/TGitMrActionGit.kt index 2fa43c4af6a..bb07f74e533 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/tgit/TGitMrActionGit.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/tgit/TGitMrActionGit.kt @@ -225,7 +225,6 @@ class TGitMrActionGit( mrId = event.object_attributes.id.toString(), retry = ApiRequestRetryInfo(true) )?.baseInfo - data.context.mrTargetBranch = event.object_attributes.target_branch data.context.gitMrReviewInfo = apiService.getMrReview( cred = getGitCred(), gitProjectId = event.object_attributes.target_project_id.toString(), @@ -236,6 +235,7 @@ class TGitMrActionGit( logger.warn("TGit MR action cache mrInfo/mrReviewInfo error", e) } } + data.context.mrTargetBranch = event.object_attributes.target_branch } override fun tryGetMrInfoFromCache(): TGitMrInfo? {