From de6ac4bf2a445a7854bbd9a603accf3d8118a719 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 11 Jun 2023 05:29:25 -0400 Subject: [PATCH] Add `WithPullRequest` for `actionsNotifier` (#25144) (#25196) Backport #25144 by @Zettat123 Fix #25093 If [`WithPullRequest`](https://github.com/go-gitea/gitea/blob/679b1f7949aa40d4f962ef27f91b0b384b9c56a5/services/actions/notifier_helper.go#L90-L96) is not called, the `Ref` in [`notifyInput`](https://github.com/go-gitea/gitea/blob/679b1f7949aa40d4f962ef27f91b0b384b9c56a5/services/actions/notifier_helper.go#L55-L65) will be empty, so the workflows in the head branch will not be found and triggered. Co-authored-by: Zettat123 --- services/actions/notifier.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/services/actions/notifier.go b/services/actions/notifier.go index 6956c25cee..66b3e3b300 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -81,6 +81,7 @@ func (n *actionsNotifier) NotifyIssueChangeStatus(ctx context.Context, doer *use newNotifyInputFromIssue(issue, webhook_module.HookEventPullRequest). WithDoer(doer). WithPayload(apiPullRequest). + WithPullRequest(issue.PullRequest). Notify(ctx) return } @@ -136,6 +137,7 @@ func (n *actionsNotifier) NotifyIssueChangeLabels(ctx context.Context, doer *use Repository: convert.ToRepo(ctx, issue.Repo, perm_model.AccessModeNone), Sender: convert.ToUser(ctx, doer, nil), }). + WithPullRequest(issue.PullRequest). Notify(ctx) return } @@ -160,6 +162,10 @@ func (n *actionsNotifier) NotifyCreateIssueComment(ctx context.Context, doer *us mode, _ := access_model.AccessLevel(ctx, doer, repo) if issue.IsPull { + if err := issue.LoadPullRequest(ctx); err != nil { + log.Error("LoadPullRequest: %v", err) + return + } newNotifyInputFromIssue(issue, webhook_module.HookEventPullRequestComment). WithDoer(doer). WithPayload(&api.IssueCommentPayload{ @@ -170,6 +176,7 @@ func (n *actionsNotifier) NotifyCreateIssueComment(ctx context.Context, doer *us Sender: convert.ToUser(ctx, doer, nil), IsPull: true, }). + WithPullRequest(issue.PullRequest). Notify(ctx) return }