Skip to content

Commit

Permalink
[IMP] Do not create milestone branch when merging PR
Browse files Browse the repository at this point in the history
Co-authored-by: Stephane Bidoul

Co-authored-by: Stéphane Bidoul <stephane.bidoul@acsone.eu>
  • Loading branch information
2 people authored and OCA-git-bot committed Feb 7, 2023
1 parent b058b67 commit d2171d4
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/oca_github_bot/tasks/merge_bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit d2171d4

Please sign in to comment.