Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit534b9b3

Browse files
GiteaBotnienjiuntaiwxiaoguang
authored
Fix job status aggregation logic (#34823) (#34835)
Backport#34823 by nienjiuntaiCo-authored-by: JIUN-TAI NIEN <44364165+nienjiuntai@users.noreply.github.com>Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
1 parentdbadc59 commit534b9b3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

‎models/actions/run_job.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ func AggregateJobStatus(jobs []*ActionRunJob) Status {
185185
returnStatusSuccess
186186
casehasCancelled:
187187
returnStatusCancelled
188-
casehasFailure:
189-
returnStatusFailure
190188
casehasRunning:
191189
returnStatusRunning
190+
casehasFailure:
191+
returnStatusFailure
192192
casehasWaiting:
193193
returnStatusWaiting
194194
casehasBlocked:

‎models/actions/run_job_status_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ func TestAggregateJobStatus(t *testing.T) {
5858
{[]Status{StatusCancelled,StatusRunning},StatusCancelled},
5959
{[]Status{StatusCancelled,StatusBlocked},StatusCancelled},
6060

61-
// failure with other status, fail fast
62-
//Should "running" win? Maybe no: old code does make "running" win, but GitHub does fail fast.
61+
// failure with other status,usuallyfail fast, but "running" wins to match GitHub's behavior
62+
//another reason that we can't make "failure" wins over "running": it would cause a weird behavior that user cannot cancel a workflow or get currentrunning workflows correctly by filter after a job fail.
6363
{[]Status{StatusFailure},StatusFailure},
6464
{[]Status{StatusFailure,StatusSuccess},StatusFailure},
6565
{[]Status{StatusFailure,StatusSkipped},StatusFailure},
6666
{[]Status{StatusFailure,StatusCancelled},StatusCancelled},
6767
{[]Status{StatusFailure,StatusWaiting},StatusFailure},
68-
{[]Status{StatusFailure,StatusRunning},StatusFailure},
68+
{[]Status{StatusFailure,StatusRunning},StatusRunning},
6969
{[]Status{StatusFailure,StatusBlocked},StatusFailure},
7070

7171
// skipped with other status

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp