From b43ce53a23a7851ee0003a9c224e7f85e9a71f98 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 29 Feb 2024 04:24:51 +0800 Subject: [PATCH] Fix workflow trigger event bugs (#29467) (#29475) Backport #29467 by @Zettat123 1. Fix incorrect `HookEventType` for issue-related events in `IssueChangeAssignee` 2. Add `case "types"` in the `switch` block in `matchPullRequestEvent` to avoid warning logs Co-authored-by: Zettat123 --- modules/actions/workflows.go | 3 +++ services/actions/notifier.go | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 2db4a9296f..595fd8bbb0 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -441,6 +441,9 @@ func matchPullRequestEvent(gitRepo *git.Repository, commit *git.Commit, prPayloa // all acts conditions should be satisfied for cond, vals := range acts { switch cond { + case "types": + // types have been checked + continue case "branches": refName := git.RefName(prPayload.PullRequest.Base.Ref) patterns, err := workflowpattern.CompilePatterns(vals...) diff --git a/services/actions/notifier.go b/services/actions/notifier.go index 87ffa66699..524ce08dba 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -153,7 +153,13 @@ func (n *actionsNotifier) IssueChangeAssignee(ctx context.Context, doer *user_mo } else { action = api.HookIssueAssigned } - notifyIssueChange(ctx, doer, issue, webhook_module.HookEventPullRequestAssign, action) + + hookEvent := webhook_module.HookEventIssueAssign + if issue.IsPull { + hookEvent = webhook_module.HookEventPullRequestAssign + } + + notifyIssueChange(ctx, doer, issue, hookEvent, action) } // IssueChangeMilestone notifies assignee to notifiers