TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Always delete existing scheduled action tasks (#27662) (#27688)

Browse source 
Backport #27662 by @KN4CK3R

Fixes #27650

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
This commit is contained in:
Giteabot 2023-10-19 15:37:20 +08:00 • committed by GitHub
parent 0b8b0072a2
commit 9b14f1a8ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
services/actions/notifier_helper.go
View file

@ -374,11 +374,6 @@ func handleSchedules(
commit *git.Commit, commit *git.Commit,
input *notifyInput, input *notifyInput,
) error { ) error {
if len(detectedWorkflows) == 0 {
log.Trace("repo %s with commit %s couldn't find schedules", input.Repo.RepoPath(), commit.ID)
return nil
}
branch, err := commit.GetBranchName() branch, err := commit.GetBranchName()
if err != nil { if err != nil {
return err return err
@ -388,18 +383,20 @@ func handleSchedules(
return nil return nil
} }
rows, _, err := actions_model.FindSchedules(ctx, actions_model.FindScheduleOptions{RepoID: input.Repo.ID}) if count, err := actions_model.CountSchedules(ctx, actions_model.FindScheduleOptions{RepoID: input.Repo.ID}); err != nil {
if err != nil { log.Error("CountSchedules: %v", err)
log.Error("FindCrons: %v", err)
return err return err
} } else if count > 0 {
if len(rows) > 0 {
if err := actions_model.DeleteScheduleTaskByRepo(ctx, input.Repo.ID); err != nil { if err := actions_model.DeleteScheduleTaskByRepo(ctx, input.Repo.ID); err != nil {
log.Error("DeleteCronTaskByRepo: %v", err) log.Error("DeleteCronTaskByRepo: %v", err)
} }
} }
if len(detectedWorkflows) == 0 {
log.Trace("repo %s with commit %s couldn't find schedules", input.Repo.RepoPath(), commit.ID)
return nil
}
p, err := json.Marshal(input.Payload) p, err := json.Marshal(input.Payload)
if err != nil { if err != nil {
return fmt.Errorf("json.Marshal: %w", err) return fmt.Errorf("json.Marshal: %w", err)