Commit39f145a

authored

Fix job status aggregation logic (#35000)

For a run (assume 2 jobs) that has a failed job and a waiting job, therun status should be waiting, **as the run is not done yet.**Related#34823

1 parent8ee9603 commit39f145aCopy full SHA for 39f145a

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -187,10 +187,10 @@ func AggregateJobStatus(jobs []*ActionRunJob) Status {`
`187`	`187`	`returnStatusCancelled`
`188`	`188`	`casehasRunning:`
`189`	`189`	`returnStatusRunning`
`190`		`-casehasFailure:`
`191`		`-returnStatusFailure`
`192`	`190`	`casehasWaiting:`
`193`	`191`	`returnStatusWaiting`
	`192`	`+casehasFailure:`
	`193`	`+returnStatusFailure`
`194`	`194`	`casehasBlocked:`
`195`	`195`	`returnStatusBlocked`
`196`	`196`	`default:`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func TestAggregateJobStatus(t *testing.T) {`
`64`	`64`	`{[]Status{StatusFailure,StatusSuccess},StatusFailure},`
`65`	`65`	`{[]Status{StatusFailure,StatusSkipped},StatusFailure},`
`66`	`66`	`{[]Status{StatusFailure,StatusCancelled},StatusCancelled},`
`67`		`-{[]Status{StatusFailure,StatusWaiting},StatusFailure},`
	`67`	`+{[]Status{StatusFailure,StatusWaiting},StatusWaiting},`
`68`	`68`	`{[]Status{StatusFailure,StatusRunning},StatusRunning},`
`69`	`69`	`{[]Status{StatusFailure,StatusBlocked},StatusFailure},`
`70`	`70`

Comments

(0)