From ee660cd7ba010a815b0b451764723efd9cdf8e2b Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Wed, 25 Dec 2024 19:37:09 +0300 Subject: [PATCH] Merge Upstream Workflow | Fix PR Check (#1715) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Чинит проверку на существование мерж ПРа, чтобы не сбросить чью-то работу. Надеюсь, последний на сегодня. --- tools/merge-upstream/merge_upstream.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/merge-upstream/merge_upstream.py b/tools/merge-upstream/merge_upstream.py index 42ab0346025c..73692fe9ba3e 100644 --- a/tools/merge-upstream/merge_upstream.py +++ b/tools/merge-upstream/merge_upstream.py @@ -401,9 +401,8 @@ def check_pull_exists(target_repo: Repository, base: str, head: str): """Check if the merge pull request already exists.""" logging.info("Checking if pull request already exists between '%s' and '%s'...", base, head) owner: str = target_repo.owner.login - base_strict = f"{owner}:{base}" head_strict = f"{owner}:{head}" - existing_pulls: PaginatedList[PullRequest] = target_repo.get_pulls(state="open", base=base_strict, head=head_strict) + existing_pulls: PaginatedList[PullRequest] = target_repo.get_pulls(state="open", base=base, head=head_strict) if existing_pulls.totalCount > 0: logging.error("Pull request already exists: %s", ", ".join(pull.html_url for pull in existing_pulls)) exit(1)