Browse Source

Fix workflow trigger event bugs (#29467)

1. Fix incorrect `HookEventType` for issue-related events in
`IssueChangeAssignee`
2. Add `case "types"` in the `switch` block in `matchPullRequestEvent`
to avoid warning logs
tags/v1.22.0-rc0
Zettat123 3 months ago
parent
commit
1ad4bb9eb7
No account linked to committer's email address
2 changed files with 10 additions and 1 deletions
  1. 3
    0
      modules/actions/workflows.go
  2. 7
    1
      services/actions/notifier.go

+ 3
- 0
modules/actions/workflows.go View File

@@ -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...)

+ 7
- 1
services/actions/notifier.go View File

@@ -152,7 +152,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

Loading…
Cancel
Save