thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 02:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62410 from ClickHouse/ci_disable_finish_check_for_mq

Browse Source 
CI: disable finish check for mq
This commit is contained in:
Max K 2024-04-09 10:33:59 +00:00 committed by GitHub
commit d5eec609cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pull_request.yml vendored
View File

@ -157,7 +157,7 @@ jobs:
################################# Stage Final ################################# ################################# Stage Final #################################
# #
FinishCheck: FinishCheck:
if: ${{ !failure() && !cancelled() }} if: ${{ !failure() && !cancelled() && github.event_name != 'merge_group' }}
needs: [Tests_1, Tests_2] needs: [Tests_1, Tests_2]
runs-on: [self-hosted, style-checker] runs-on: [self-hosted, style-checker]
steps: steps:

9
tests/ci/commit_status_helper.py
View File

@ -148,6 +148,11 @@ def set_status_comment(commit: Commit, pr_info: PRInfo) -> None:
"""It adds or updates the comment status to all Pull Requests but for release """It adds or updates the comment status to all Pull Requests but for release
one, so the method does nothing for simple pushes and pull requests with one, so the method does nothing for simple pushes and pull requests with
`release`/`release-lts` labels""" `release`/`release-lts` labels"""
if pr_info.is_merge_queue():
# skip report creation for the MQ
return
# to reduce number of parameters, the Github is constructed on the fly # to reduce number of parameters, the Github is constructed on the fly
gh = Github() gh = Github()
gh.__requester = commit._requester # type:ignore #pylint:disable=protected-access gh.__requester = commit._requester # type:ignore #pylint:disable=protected-access
@ -441,7 +446,9 @@ def update_mergeable_check(commit: Commit, pr_info: PRInfo, check_name: str) ->
or pr_info.release_pr or pr_info.release_pr
or pr_info.number == 0 or pr_info.number == 0
) )
if not_run:
# FIXME: For now, always set mergeable check in the Merge Queue. It's required to pass MQ
if not_run and not pr_info.is_merge_queue():
# Let's avoid unnecessary work # Let's avoid unnecessary work
return return

19
tests/ci/run_check.py
View File

@ -201,14 +201,17 @@ def main():
ci_report_url = create_ci_report(pr_info, []) ci_report_url = create_ci_report(pr_info, [])
print("::notice ::Can run") print("::notice ::Can run")
post_commit_status(
commit, if not pr_info.is_merge_queue():
PENDING, # we need clean CI status for MQ to merge (no pending statuses)
ci_report_url, post_commit_status(
description, commit,
CI_STATUS_NAME, PENDING,
pr_info, ci_report_url,
) description,
CI_STATUS_NAME,
pr_info,
)
if __name__ == "__main__": if __name__ == "__main__":