Merge branch 'release/v1.20' into backport-26112-v1.20

go-gitea · Jul 25, 2023 · 170723c · 170723c
2 parents 63ac2f7 + 08cdc0d
commit 170723c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 {