mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-12 22:10:25 +00:00
51866ad6b8
The conflict resolution is explained in the "Conflict" section of the commit message. I used `cherry-pick -x`. Here is the conflict for information (simple one). ```diff unmerged services/actions/schedule_tasks.go @@@ -22,8 -22,7 +22,12 @@@ import "code.forgejo.org/forgejo/runner/v12/act/jobparser" act_model "code.forgejo.org/forgejo/runner/v12/act/model" ++<<<<<<< HEAD + "github.com/robfig/cron/v3" + "xorm.io/builder" ++======= + "github.com/gdgvda/cron" ++>>>>>>>b6af380324(fix: in actions_service cancelJobsForRun is bugous use killRun instead) ) // StartScheduleTasks start the task ``` --- **Backport:** https://codeberg.org/forgejo/forgejo/pulls/12366 The cancelJobsForRun function is redundant with the killRun function and has bugs: - It does not use a transaction and may fail in a non-recoverable way - It does not update the commit status of the run - It does not set NeedRemoval to false if needed Remove the cancelJobsForRun function and use killRun instead (fixing forgejo/forgejo#12386). Both calls are covered by existing tests: - TestCancelPreviousJobs - TestCancelPreviousWithConcurrencyGroup A new integration test TestActionsPullRequestTrustPushCancel is added to verify that the NeedApproval field is set to false whenever a run is cancelled (fixing forgejo/forgejo#12350). Closes forgejo/forgejo#12350 Closes forgejo/forgejo#12386 (cherry picked from commitb6af380324) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/12492 Reviewed-by: Andreas Ahlenstorf <aahlenst@noreply.codeberg.org> Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org>
502 B
502 B
When the author of a pull request is denied the right to run Actions by clicking on the "Deny" button on the pull request trust management panel, the workflow runs created for all commits pushed to the pull request are cancelled. Before that, runs that were automatically cancelled because a newer commit was pushed to the pull request were stuck in a state waiting for approval.