Bladeren bron

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 <zettat123@gmail.com>
tags/v1.21.8
Giteabot 3 maanden geleden
bovenliggende
commit
b43ce53a23
No account linked to committer's email address
2 gewijzigde bestanden met toevoegingen van 10 en 1 verwijderingen
  1. 3
    0
      modules/actions/workflows.go
  2. 7
    1
      services/actions/notifier.go

+ 3
- 0
modules/actions/workflows.go Bestand weergeven

@@ -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 Bestand weergeven

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

Laden…
Annuleren
Opslaan