Merge pull request #45803 from ClickHouse/revert-45802-revert-45801-automerge

Add check for running workflows to merge_pr.py

docs/tools/.gitignore

@@ -1,3 +1,2 @@
-build
 __pycache__
 *.pyc

tests/ci/merge_pr.py

@@ -10,11 +10,13 @@ from os import getenv
 from pprint import pformat
 from typing import Dict, List
 
+from github.PaginatedList import PaginatedList
 from github.PullRequestReview import PullRequestReview
+from github.WorkflowRun import WorkflowRun
 
 from commit_status_helper import get_commit_filtered_statuses
 from get_robot_token import get_best_robot_token
-from github_helper import GitHub, NamedUser, PullRequest
+from github_helper import GitHub, NamedUser, PullRequest, Repository
 from pr_info import PRInfo
 
 
@@ -127,6 +129,20 @@ class Reviews:
         return False
 
 
+def get_workflows_for_head(repo: Repository, head_sha: str) -> List[WorkflowRun]:
+    # The monkey-patch until the PR is merged:
+    # https://github.com/PyGithub/PyGithub/pull/2408
+    return list(
+        PaginatedList(
+            WorkflowRun,
+            repo._requester,  # type:ignore # pylint:disable=protected-access
+            f"{repo.url}/actions/runs",
+            {"head_sha": head_sha},
+            list_item="workflow_runs",
+        )
+    )
+
+
 def parse_args() -> argparse.Namespace:
     pr_info = PRInfo()
     parser = argparse.ArgumentParser(
@@ -134,11 +150,26 @@ def parse_args() -> argparse.Namespace:
         description="Script to merge the given PR. Additional checks for approved "
         "status and green commit statuses could be done",
     )
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="if set, the script won't merge the PR, just check the conditions",
+    )
     parser.add_argument(
         "--check-approved",
         action="store_true",
         help="if set, checks that the PR is approved and no changes required",
     )
+    parser.add_argument(
+        "--check-running-workflows", default=True, help=argparse.SUPPRESS
+    )
+    parser.add_argument(
+        "--no-check-running-workflows",
+        dest="check_running_workflows",
+        action="store_false",
+        default=argparse.SUPPRESS,
+        help="(dangerous) if set, skip checking for running workflows for the PR head",
+    )
     parser.add_argument("--check-green", default=True, help=argparse.SUPPRESS)
     parser.add_argument(
         "--no-check-green",
@@ -194,6 +225,19 @@ def main():
         logging.info("The PR #%s is not ready for merge, stopping", pr.number)
         return
 
+    if args.check_running_workflows:
+        workflows = get_workflows_for_head(repo, pr.head.sha)
+        workflows_in_progress = [wf for wf in workflows if wf.status != "completed"]
+        # At most one workflow in progress is fine. We check that there no
+        # cases like, e.g. PullRequestCI and DocksCheck in progress at once
+        if len(workflows_in_progress) > 1:
+            logging.info(
+                "The PR #%s has more than one workflows in progress, check URLs:\n%s",
+                pr.number,
+                "\n".join(wf.html_url for wf in workflows_in_progress),
+            )
+            return
+
     if args.check_green:
         logging.info("Checking that all PR's statuses are green")
         commit = repo.get_commit(pr.head.sha)
@@ -217,6 +261,7 @@ def main():
             return
 
     logging.info("Merging the PR")
+    if not args.dry_run:
         pr.merge()