mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-28 02:21:59 +00:00
Merge pull request #61388 from ClickHouse/backport/24.2/61373
Backport #61373 to 24.2: Reorder hidden and shown checks in comment, change url of Mergeable check
This commit is contained in:
commit
9293d361e7
@ -18,8 +18,10 @@ from github.GithubObject import NotSet
|
|||||||
from github.IssueComment import IssueComment
|
from github.IssueComment import IssueComment
|
||||||
from github.Repository import Repository
|
from github.Repository import Repository
|
||||||
|
|
||||||
from ci_config import REQUIRED_CHECKS, CHECK_DESCRIPTIONS, CheckDescription
|
# isort: on
|
||||||
from env_helper import GITHUB_JOB_URL, GITHUB_REPOSITORY, TEMP_PATH
|
|
||||||
|
from ci_config import CHECK_DESCRIPTIONS, REQUIRED_CHECKS, CheckDescription
|
||||||
|
from env_helper import GITHUB_REPOSITORY, GITHUB_RUN_URL, TEMP_PATH
|
||||||
from pr_info import SKIP_MERGEABLE_CHECK_LABEL, PRInfo
|
from pr_info import SKIP_MERGEABLE_CHECK_LABEL, PRInfo
|
||||||
from report import (
|
from report import (
|
||||||
ERROR,
|
ERROR,
|
||||||
@ -259,6 +261,12 @@ def generate_status_comment(pr_info: PRInfo, statuses: CommitStatuses) -> str:
|
|||||||
|
|
||||||
result = [comment_body]
|
result = [comment_body]
|
||||||
|
|
||||||
|
if visible_table_rows:
|
||||||
|
visible_table_rows.sort()
|
||||||
|
result.append(table_header)
|
||||||
|
result.extend(visible_table_rows)
|
||||||
|
result.append(table_footer)
|
||||||
|
|
||||||
if hidden_table_rows:
|
if hidden_table_rows:
|
||||||
hidden_table_rows.sort()
|
hidden_table_rows.sort()
|
||||||
result.append(details_header)
|
result.append(details_header)
|
||||||
@ -267,12 +275,6 @@ def generate_status_comment(pr_info: PRInfo, statuses: CommitStatuses) -> str:
|
|||||||
result.append(table_footer)
|
result.append(table_footer)
|
||||||
result.append(details_footer)
|
result.append(details_footer)
|
||||||
|
|
||||||
if visible_table_rows:
|
|
||||||
visible_table_rows.sort()
|
|
||||||
result.append(table_header)
|
|
||||||
result.extend(visible_table_rows)
|
|
||||||
result.append(table_footer)
|
|
||||||
|
|
||||||
return "".join(result)
|
return "".join(result)
|
||||||
|
|
||||||
|
|
||||||
@ -427,7 +429,7 @@ def set_mergeable_check(
|
|||||||
context=MERGEABLE_NAME,
|
context=MERGEABLE_NAME,
|
||||||
description=format_description(description),
|
description=format_description(description),
|
||||||
state=state,
|
state=state,
|
||||||
target_url=GITHUB_JOB_URL(),
|
target_url=GITHUB_RUN_URL,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user