ynkmr/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-09-22 20:53:40 +09:00
Code Issues Projects Releases Wiki Activity

fix(actions): allow cancelling runs without running jobs (#35842) (#38812)

Browse Source
This commit is contained in:
Zettat123
2026-08-07 06:54:08 +02:00
committed by GitHub
parent 00a637295e
commit eab225f095
3 changed files with 173 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routers/web/repo/actions/view.go
+9 -3
View File
@@ -1063,7 +1063,10 @@ func Cancel(ctx *context_module.Context) {
return fmt.Errorf("cancel jobs: %w", err)
}
updatedJobs = append(updatedJobs, cancelledJobs...)
return nil
if len(updatedJobs) > 0 {
return nil // a job update already refreshed the run
}
return actions_model.SettleRunAfterCancel(ctx, run)
}); err != nil {
ctx.ServerError("StopTask", err)
return
@@ -1073,8 +1076,11 @@ func Cancel(ctx *context_module.Context) {
actions_service.EmitJobsIfReadyByJobs(updatedJobs)
actions_service.NotifyWorkflowJobsStatusUpdate(ctx, updatedJobs...)
if len(updatedJobs) > 0 {
actions_service.NotifyWorkflowRunStatusUpdateWithReload(ctx, run.RepoID, run.ID)
// SettleRunAfterCancel finishes a run without updating any job, so compare the run itself.
if reloaded, err := actions_model.GetRunByRepoAndID(ctx, run.RepoID, run.ID); err != nil {
log.Error("GetRunByRepoAndID: %v", err)
} else if len(updatedJobs) > 0 || reloaded.Status != run.Status {
actions_service.NotifyWorkflowRunStatusUpdate(ctx, reloaded)
}
ctx.JSONOK()
}