aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--models/actions/run_job.go4
-rw-r--r--models/actions/run_job_status_test.go2
2 files changed, 3 insertions, 3 deletions
diff --git a/models/actions/run_job.go b/models/actions/run_job.go
index bad895036d..e7fa21270c 100644
--- a/models/actions/run_job.go
+++ b/models/actions/run_job.go
@@ -187,10 +187,10 @@ func AggregateJobStatus(jobs []*ActionRunJob) Status {
return StatusCancelled
case hasRunning:
return StatusRunning
- case hasFailure:
- return StatusFailure
case hasWaiting:
return StatusWaiting
+ case hasFailure:
+ return StatusFailure
case hasBlocked:
return StatusBlocked
default:
diff --git a/models/actions/run_job_status_test.go b/models/actions/run_job_status_test.go
index 2a5eb00a6f..b9ae9f34bf 100644
--- a/models/actions/run_job_status_test.go
+++ b/models/actions/run_job_status_test.go
@@ -64,7 +64,7 @@ func TestAggregateJobStatus(t *testing.T) {
{[]Status{StatusFailure, StatusSuccess}, StatusFailure},
{[]Status{StatusFailure, StatusSkipped}, StatusFailure},
{[]Status{StatusFailure, StatusCancelled}, StatusCancelled},
- {[]Status{StatusFailure, StatusWaiting}, StatusFailure},
+ {[]Status{StatusFailure, StatusWaiting}, StatusWaiting},
{[]Status{StatusFailure, StatusRunning}, StatusRunning},
{[]Status{StatusFailure, StatusBlocked}, StatusFailure},