diff options
| author | Zettat123 <zettat123@gmail.com> | 2023-07-08 03:22:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-07 19:22:03 +0000 |
| commit | a42a838843771de729ce4e9b7b9146186c072cd4 (patch) | |
| tree | 60ddf41bf2bc393101bcc092038343109f4b5f08 /services/actions | |
| parent | 811fc9d49c7f2ef128780d9b1a8dac31831f1f7b (diff) | |
| download | gitea-a42a838843771de729ce4e9b7b9146186c072cd4.tar.gz gitea-a42a838843771de729ce4e9b7b9146186c072cd4.zip | |
Fix `ref` for workflows triggered by `pull_request_target` (#25743)
Follow #25229
At present, when the trigger event is `pull_request_target`, the `ref`
and `sha` of `ActionRun` are set according to the base branch of the
pull request. This makes it impossible for us to find the head branch of
the `ActionRun` directly. In this PR, the `ref` and `sha` will always be
set to the head branch and they will be changed to the base branch when
generating the task context.
Diffstat (limited to 'services/actions')
| -rw-r--r-- | services/actions/notifier_helper.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index 8e6cdcf680..c4c2a0df29 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -152,7 +152,6 @@ func notify(ctx context.Context, input *notifyInput) error { } else { for _, wf := range workflows { if wf.TriggerEvent != actions_module.GithubEventPullRequestTarget { - wf.Ref = ref detectedWorkflows = append(detectedWorkflows, wf) } } @@ -174,7 +173,6 @@ func notify(ctx context.Context, input *notifyInput) error { } else { for _, wf := range baseWorkflows { if wf.TriggerEvent == actions_module.GithubEventPullRequestTarget { - wf.Ref = baseRef detectedWorkflows = append(detectedWorkflows, wf) } } @@ -212,8 +210,8 @@ func notify(ctx context.Context, input *notifyInput) error { OwnerID: input.Repo.OwnerID, WorkflowID: dwf.EntryName, TriggerUserID: input.Doer.ID, - Ref: dwf.Ref, - CommitSHA: dwf.Commit.ID.String(), + Ref: ref, + CommitSHA: commit.ID.String(), IsForkPullRequest: isForkPullRequest, Event: input.Event, EventPayload: string(p), |