From 0fd9d08ea0f216230daae69750f596d96a5e5dfa Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 22 Jan 2024 15:06:50 +0000 Subject: [PATCH] Revert "Fix schedule not trigger bug because matching full ref name with short ref name (#28874)" This reverts commit 23efd9d2781c2ac22594a83afa75182d276b1571. (cherry picked from commit b263ac67e08fdd315f8bbb8de9eff81d85a579c1) (cherry picked from commit 4699db575c074607c5b1f4ef1ff552185e040c06) --- services/actions/notifier_helper.go | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index 16a40366a..217ae6c6b 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -160,28 +160,24 @@ func notify(ctx context.Context, input *notifyInput) error { workflows, schedules, err := actions_module.DetectWorkflows(gitRepo, commit, input.Event, input.Payload, - input.Event == webhook_module.HookEventPush && git.RefName(input.Ref).BranchName() == input.Repo.DefaultBranch, + input.Event == webhook_module.HookEventPush && input.Ref == input.Repo.DefaultBranch, ) if err != nil { return fmt.Errorf("DetectWorkflows: %w", err) } - log.Trace("repo %s with commit %s event %s find %d workflows and %d schedules", - input.Repo.RepoPath(), - commit.ID, - input.Event, - len(workflows), - len(schedules), - ) + if len(workflows) == 0 { + log.Trace("repo %s with commit %s couldn't find workflows", input.Repo.RepoPath(), commit.ID) + } else { + for _, wf := range workflows { + if actionsConfig.IsWorkflowDisabled(wf.EntryName) { + log.Trace("repo %s has disable workflows %s", input.Repo.RepoPath(), wf.EntryName) + continue + } - for _, wf := range workflows { - if actionsConfig.IsWorkflowDisabled(wf.EntryName) { - log.Trace("repo %s has disable workflows %s", input.Repo.RepoPath(), wf.EntryName) - continue - } - - if wf.TriggerEvent.Name != actions_module.GithubEventPullRequestTarget { - detectedWorkflows = append(detectedWorkflows, wf) + if wf.TriggerEvent.Name != actions_module.GithubEventPullRequestTarget { + detectedWorkflows = append(detectedWorkflows, wf) + } } }