NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] runbot_merge: add change of target branch between merges

Browse Source
This commit is contained in:
Xavier Morel 2018-09-20 10:04:13 +02:00
parent 58f1c34e3f
commit 3d8add9c11
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runbot_merge/models/pull_requests.py
View File

@ -947,6 +947,7 @@ class Batch(models.Model):
) )
target = 'tmp.{}'.format(pr.target.name) target = 'tmp.{}'.format(pr.target.name)
original_head = gh.head(target)
try: try:
# nb: pr_commits is oldest to newest so pr.head is pr_commits[-1] # nb: pr_commits is oldest to newest so pr.head is pr_commits[-1]
pr_commits = gh.commits(pr.number) pr_commits = gh.commits(pr.number)
@ -997,7 +998,12 @@ class Batch(models.Model):
# otherwise do a regular merge # otherwise do a regular merge
msg = build_message(pr.message, pr) msg = build_message(pr.message, pr)
new_heads[pr] = gh.merge(pr.head, target, msg)['sha'] new_heads[pr] = gh.merge(pr.head, target, msg)['sha']
_logger.info("Staged pr %s:%s by %s to %s", pr.repository.name, pr.number, method, new_heads[pr]) new_head = gh.head(target)
_logger.info(
"Staged pr %s:%s by %s to %s; %s %s -> %s",
pr.repository.name, pr.number, method, new_heads[pr],
target, original_head, new_head
)
except (exceptions.MergeError, AssertionError) as e: except (exceptions.MergeError, AssertionError) as e:
_logger.exception("Failed to merge %s:%s into staging branch (error: %s)", pr.repository.name, pr.number, e) _logger.exception("Failed to merge %s:%s into staging branch (error: %s)", pr.repository.name, pr.number, e)
pr.state = 'error' pr.state = 'error'