From 3018c45a70f7240b0f561ce71c5eecca5e99f8d6 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: Stéphane Bidoul --- src/oca_github_bot/tasks/merge_bot.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/oca_github_bot/tasks/merge_bot.py b/src/oca_github_bot/tasks/merge_bot.py index 3f6364a3..f2388a3e 100644 --- a/src/oca_github_bot/tasks/merge_bot.py +++ b/src/oca_github_bot/tasks/merge_bot.py @@ -27,11 +27,7 @@ from ..utils import hide_secrets 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, -) +from .migration_issue_bot import _find_issue, mark_migration_line_done _logger = getLogger(__name__) @@ -208,8 +204,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_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)