From e2101ae572e5b937b17e70cb703ff40c00652c20 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 25 Jul 2023 06:22:58 -0400 Subject: [PATCH] Fix wrong workflow status when rerun a job in an already finished workflow (#26119) (#26124) Backport #26119 by @yp05327 Before: ![image](https://github.com/go-gitea/gitea/assets/18380374/fb687592-b117-4cd5-b076-2ca5ca847ea4) After: ![image](https://github.com/go-gitea/gitea/assets/18380374/c9b0683e-e81d-410b-8c35-fbe54327fab4) After workflow finished, if you rerun a single job, the workflow status will become to `Running` which is not correct as no jobs are running in this workflow. Co-authored-by: yp05327 <576951401@qq.com> (cherry picked from commit 08cdc0da3d6a649892a3687635640d02e3cd9fcf) --- models/actions/run_job.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/actions/run_job.go b/models/actions/run_job.go index 0002e50770..b443747c67 100644 --- a/models/actions/run_job.go +++ b/models/actions/run_job.go @@ -143,7 +143,7 @@ func aggregateJobStatus(jobs []*ActionRunJob) Status { if !job.Status.IsDone() { allDone = false } - if job.Status != StatusWaiting { + if job.Status != StatusWaiting && !job.Status.IsDone() { allWaiting = false } if job.Status == StatusFailure || job.Status == StatusCancelled {