limiting-factor 51866ad6b8 [v15.0/forgejo] fix: in actions_service cancelJobsForRun is bugous use killRun instead (#12492) ... 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 commit b6af380324) 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>		2026-05-09 21:00:52 +02:00
..
e2e	[v15.0/forgejo] fix: CodeMirror e2e test (#12199)	2026-04-20 14:23:22 +02:00
fuzz	chore: branding import path (#7337)	2025-03-27 19:40:14 +00:00
gitea-lfs-meta	Test views of LFS files (#22196)	2022-12-23 07:41:56 +08:00
gitea-repositories-meta	[v15.0/forgejo] fix: compare branches with names diff or patch (#12233)	2026-04-23 01:28:54 +02:00
integration	[v15.0/forgejo] fix: in actions_service cancelJobsForRun is bugous use killRun instead (#12492)	2026-05-09 21:00:52 +02:00
testdata/data	add model viewer for .glb (GLTF) model in file view (#8111)	2025-06-21 14:42:35 +02:00
mysql.ini.tmpl	feat: match on compound filename extensions (#11439)	2026-03-19 01:25:51 +01:00
pgsql.ini.tmpl	feat: match on compound filename extensions (#11439)	2026-03-19 01:25:51 +01:00
sqlite.ini.tmpl	feat: match on compound filename extensions (#11439)	2026-03-19 01:25:51 +01:00
test_utils.go	[v15.0/forgejo]: chore: add modernizer linter (#11949)	2026-04-02 16:54:46 +02:00