Skip to content

Commit 3018c45

Browse files
legalsylvainsbidoul
andcommitted
[IMP] Do not create milestone branch when merging PR
Co-authored-by: Stéphane Bidoul <[email protected]>
1 parent b058b67 commit 3018c45

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

src/oca_github_bot/tasks/merge_bot.py

+2-7
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@
2727
from ..utils import hide_secrets
2828
from ..version_branch import make_merge_bot_branch, parse_merge_bot_branch
2929
from .main_branch_bot import main_branch_bot_actions
30-
from .migration_issue_bot import (
31-
_check_line_issue,
32-
_create_or_find_branch_milestone,
33-
_find_issue,
34-
)
30+
from .migration_issue_bot import _find_issue, mark_migration_line_done
3531

3632
_logger = getLogger(__name__)
3733

@@ -208,8 +204,7 @@ def _merge_bot_merge_pr(org, repo, merge_bot_branch, cwd, dry_run=False):
208204
github.gh_call(gh_pr.close)
209205

210206
# Check line in migration issue if required
211-
milestone = _create_or_find_branch_milestone(gh_repo, target_branch)
212-
migration_issue = _find_issue(gh_repo, milestone, target_branch)
207+
migration_issue = _find_issue(gh_repo, target_branch)
213208
if migration_issue:
214209
new_body = _check_line_issue(gh_pr.number, migration_issue.body)
215210
migration_issue.edit(body=new_body)

0 commit comments

Comments
 (0)