Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update scheduled tasks even if changes are pushed by "ActionsUser" #32246

Merged
merged 4 commits into from
Oct 13, 2024
Merged

Update scheduled tasks even if changes are pushed by "ActionsUser" #32246

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f159733
fix updating schedule tasks
Zettat123 Oct 12, 2024
088a01f
Update services/actions/notifier_helper.go
Zettat123 Oct 12, 2024
2876dfa
Merge branch 'main' into bugfix/issue-32219
GiteaBot Oct 13, 2024
6dd0d1e
Merge branch 'main' into bugfix/issue-32219
GiteaBot Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion services/actions/notifier_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,20 @@ func (input *notifyInput) Notify(ctx context.Context) {
}

func notify(ctx context.Context, input *notifyInput) error {
shouldDetectSchedules := input.Event == webhook_module.HookEventPush && input.Ref.BranchName() == input.Repo.DefaultBranch
if input.Doer.IsActions() {
// avoiding triggering cyclically, for example:
// a comment of an issue will trigger the runner to add a new comment as reply,
// and the new comment will trigger the runner again.
log.Debug("ignore executing %v for event %v whose doer is %v", getMethod(ctx), input.Event, input.Doer.Name)

// we should update schedule tasks in this case, because
// 1. schedule tasks cannot be triggered by other events, so cyclic triggering will not occur
// 2. some schedule tasks may update the repo periodically, so the refs of schedule tasks need to be updated
if shouldDetectSchedules {
return DetectAndHandleSchedules(ctx, input.Repo)
}

return nil
}
if input.Repo.IsEmpty || input.Repo.IsArchived {
Expand Down Expand Up @@ -174,7 +183,6 @@ func notify(ctx context.Context, input *notifyInput) error {

var detectedWorkflows []*actions_module.DetectedWorkflow
actionsConfig := input.Repo.MustGetUnit(ctx, unit_model.TypeActions).ActionsConfig()
shouldDetectSchedules := input.Event == webhook_module.HookEventPush && input.Ref.BranchName() == input.Repo.DefaultBranch
workflows, schedules, err := actions_module.DetectWorkflows(gitRepo, commit,
input.Event,
input.Payload,
Expand Down
Loading