Skip to content

Commit 97856bb

Browse files
JelteFJelteF
committed
Handle FormattingCheck specially
It shouldn't be a hard failure. So this makes it yellow.
1 parent 0fc2d61 commit 97856bb

File tree

5 files changed

+87
-17
lines changed

5 files changed

+87
-17
lines changed

‎pgcommitfest/commitfest/fixtures/commitfest_data.json‎

Lines changed: 66 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,19 +1106,19 @@
11061106
"fields": {
11071107
"branch_id": 345,
11081108
"branch_name": "cf/2",
1109-
"commit_id": null,
1109+
"commit_id": "def456",
11101110
"apply_url": "http://cfbot.cputube.org/patch_4573.log",
1111-
"status": "failed",
1112-
"needs_rebase_since": "2025-03-01T22:30:42",
1113-
"failing_since": "2025-02-01T22:30:42",
1111+
"status": "finished",
1112+
"needs_rebase_since": null,
1113+
"failing_since": null,
11141114
"created": "2025-01-26T22:11:09.961",
11151115
"modified": "2025-03-01T22:59:14.717",
1116-
"version": "",
1117-
"patch_count": null,
1118-
"first_additions": null,
1119-
"first_deletions": null,
1120-
"all_additions": null,
1121-
"all_deletions": null
1116+
"version": "v2",
1117+
"patch_count": 3,
1118+
"first_additions": 50,
1119+
"first_deletions": 10,
1120+
"all_additions": 120,
1121+
"all_deletions": 35
11221122
}
11231123
},
11241124
{
@@ -1295,5 +1295,61 @@
12951295
"created": "2025-07-03T06:29:25.086",
12961296
"modified": "2025-07-03T06:29:25.086"
12971297
}
1298+
},
1299+
{
1300+
"model": "commitfest.cfbottask",
1301+
"pk": 9,
1302+
"fields": {
1303+
"task_id": "12347",
1304+
"task_name": "FormattingCheck",
1305+
"patch": 1,
1306+
"branch_id": 123,
1307+
"position": 3,
1308+
"status": "FAILED",
1309+
"created": "2025-01-26T22:08:00.000",
1310+
"modified": "2025-01-26T22:08:30.000"
1311+
}
1312+
},
1313+
{
1314+
"model": "commitfest.cfbottask",
1315+
"pk": 10,
1316+
"fields": {
1317+
"task_id": "34501",
1318+
"task_name": "Linux build",
1319+
"patch": 2,
1320+
"branch_id": 345,
1321+
"position": 1,
1322+
"status": "COMPLETED",
1323+
"created": "2025-01-26T22:11:30.000",
1324+
"modified": "2025-01-26T22:12:15.000"
1325+
}
1326+
},
1327+
{
1328+
"model": "commitfest.cfbottask",
1329+
"pk": 11,
1330+
"fields": {
1331+
"task_id": "34502",
1332+
"task_name": "MacOS Build",
1333+
"patch": 2,
1334+
"branch_id": 345,
1335+
"position": 2,
1336+
"status": "COMPLETED",
1337+
"created": "2025-01-26T22:11:35.000",
1338+
"modified": "2025-01-26T22:13:20.000"
1339+
}
1340+
},
1341+
{
1342+
"model": "commitfest.cfbottask",
1343+
"pk": 12,
1344+
"fields": {
1345+
"task_id": "34503",
1346+
"task_name": "FormattingCheck",
1347+
"patch": 2,
1348+
"branch_id": 345,
1349+
"position": 3,
1350+
"status": "COMPLETED",
1351+
"created": "2025-01-26T22:11:40.000",
1352+
"modified": "2025-01-26T22:12:00.000"
1353+
}
12981354
}
12991355
]

‎pgcommitfest/commitfest/templates/commitfest.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,10 @@ <h3>{{p.is_open|yesno:"Active patches,Closed patches"}}</h3>
7575
<a href="https://github.com/postgresql-cfbot/postgresql/compare/cf/{{p.id}}~1...cf/{{p.id}}" title="View last patch set on GitHub"><img class="github-logo" src="/media/commitfest/github-mark.svg"/></a>
7676
<a href="https://cirrus-ci.com/github/postgresql-cfbot/postgresql/cf%2F{{p.id}}"
7777
title="View CI history. {%if p.failing_since%}Failing {% cfsince p.failing_since %}. {%endif%}{%if cfb.failed_task_names %}Failed jobs: {{cfb.failed_task_names}}{%endif%}">
78-
{%if cfb.failed > 0 or cfb.branch_status == 'failed' or cfb.branch_status == 'timeout' %}
78+
{%if cfb.branch_status == 'failed' or cfb.branch_status == 'timeout' or cfb.failed_non_formatting > 0 %}
7979
<img src="/media/commitfest/new_failure.svg"/>
80+
{%elif cfb.failed > 0 %}
81+
<img src="/media/commitfest/formatting_failure.svg"/>
8082
{%elif cfb.completed < cfb.total %}
8183
<img src="/media/commitfest/running.svg"/>
8284
{%else%}

‎pgcommitfest/commitfest/templates/home.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,10 @@ <h3>{%if user.is_authenticated%}Open patches you are subscribed to{%elif p.is_op
182182
<a href="https://github.com/postgresql-cfbot/postgresql/compare/cf/{{p.id}}~1...cf/{{p.id}}" title="View last patch set on GitHub"><img class="github-logo" src="/media/commitfest/github-mark.svg"/></a>
183183
<a href="https://cirrus-ci.com/github/postgresql-cfbot/postgresql/cf%2F{{p.id}}"
184184
title="View CI history. {%if p.failing_since%}Failing {% cfsince p.failing_since %}. {%endif%}{%if cfb.failed_task_names %}Failed jobs: {{cfb.failed_task_names}}{%endif%}">
185-
{%if cfb.failed > 0 or cfb.branch_status == 'failed' or cfb.branch_status == 'timeout' %}
185+
{%if cfb.branch_status == 'failed' or cfb.branch_status == 'timeout' or cfb.failed_non_formatting > 0 %}
186186
<img src="/media/commitfest/new_failure.svg"/>
187+
{%elif cfb.failed > 0 %}
188+
<img src="/media/commitfest/formatting_failure.svg"/>
187189
{%elif cfb.completed < cfb.total %}
188190
<img src="/media/commitfest/running.svg"/>
189191
{%else%}

‎pgcommitfest/commitfest/templates/patch.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@
3838
{%elif c.status == 'EXECUTING' %}
3939
<a href="https://cirrus-ci.com/task/{{c.task_id}}" title="{{c.task_name}}: {{c.status}}"><img src="/media/commitfest/running.svg"/></a>
4040
{%else %}
41-
<a href="https://cirrus-ci.com/task/{{c.task_id}}" title="{{c.task_name}}: {{c.status}}"><img src="/media/commitfest/new_failure.svg"/></a>
41+
{%if c.task_name == 'FormattingCheck' %}
42+
<a href="https://cirrus-ci.com/task/{{c.task_id}}" title="{{c.task_name}}: {{c.status}}"><img src="/media/commitfest/formatting_failure.svg"/></a>
43+
{%else%}
44+
<a href="https://cirrus-ci.com/task/{{c.task_id}}" title="{{c.task_name}}: {{c.status}}"><img src="/media/commitfest/new_failure.svg"/></a>
45+
{%endif%}
4246
{%endif%}
4347
{%endfor%}
4448
{%endif%}

‎pgcommitfest/commitfest/views.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,7 @@ def patchlist(request, cf, personalized=False):
564564
count(*) FILTER (WHERE task.status in ('COMPLETED', 'PAUSED')) as completed,
565565
count(*) FILTER (WHERE task.status in ('CREATED', 'SCHEDULED', 'EXECUTING')) running,
566566
count(*) FILTER (WHERE task.status in ('ABORTED', 'ERRORED', 'FAILED')) failed,
567+
count(*) FILTER (WHERE task.status in ('ABORTED', 'ERRORED', 'FAILED') AND task.task_name != 'FormattingCheck') as failed_non_formatting,
567568
count(*) total,
568569
string_agg(task.task_name, ', ') FILTER (WHERE task.status in ('ABORTED', 'ERRORED', 'FAILED')) as failed_task_names,
569570
branch.status as branch_status,
@@ -1526,10 +1527,15 @@ def cfbot_ingest(message):
15261527
failing = branch_status["status"] in ("failed", "timeout") or needs_rebase
15271528
finished = branch_status["status"] == "finished"
15281529

1529-
if "task_status" in message and message["task_status"]["status"] in (
1530-
"ABORTED",
1531-
"ERRORED",
1532-
"FAILED",
1530+
if (
1531+
"task_status" in message
1532+
and message["task_status"]["status"]
1533+
in (
1534+
"ABORTED",
1535+
"ERRORED",
1536+
"FAILED",
1537+
)
1538+
and message["task_status"]["task_name"] != "FormattingCheck"
15331539
):
15341540
failing = True
15351541

0 commit comments

Comments
 (0)