From d2171d48c088d715261c35d9009931bdbb6c7f0c Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Tue, 7 Feb 2023 21:06:43 +0100 Subject: [PATCH] [IMP] Do not create milestone branch when merging PR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Stephane Bidoul Co-authored-by: Stéphane Bidoul --- src/oca_github_bot/tasks/merge_bot.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/oca_github_bot/tasks/merge_bot.py b/src/oca_github_bot/tasks/merge_bot.py index 3f6364a3..3782724c 100644 --- a/src/oca_github_bot/tasks/merge_bot.py +++ b/src/oca_github_bot/tasks/merge_bot.py @@ -28,9 +28,8 @@ from ..version_branch import make_merge_bot_branch, parse_merge_bot_branch from .main_branch_bot import main_branch_bot_actions from .migration_issue_bot import ( - _check_line_issue, - _create_or_find_branch_milestone, - _find_issue, + mark_migration_line_done, + find_migration_issue, ) _logger = getLogger(__name__) @@ -208,8 +207,7 @@ def _merge_bot_merge_pr(org, repo, merge_bot_branch, cwd, dry_run=False): github.gh_call(gh_pr.close) # Check line in migration issue if required - milestone = _create_or_find_branch_milestone(gh_repo, target_branch) - migration_issue = _find_issue(gh_repo, milestone, target_branch) + migration_issue = find_migration_issue(gh_repo, target_branch) if migration_issue: new_body = _check_line_issue(gh_pr.number, migration_issue.body) migration_issue.edit(body=new_body)