NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] runbot_merge: add logging to staging

Browse Source 
I can't repro staging 13, so adding some logging.
This commit is contained in:
Xavier Morel 2018-09-19 18:09:45 +02:00
parent 6dbfde0389
commit d3952de3d5
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runbot_merge/models/pull_requests.py
View File

@ -953,10 +953,12 @@ class Batch(models.Model):
rebase_and_merge = pr.rebase
squash = rebase_and_merge and len(pr_commits) == 1
if squash:
method = 'squash'
msg = build_message(pr_commits[0]['commit']['message'], pr)
pr_commits[0]['commit']['message'] = msg
new_heads[pr] = gh.rebase(pr.number, target, commits=pr_commits)
elif rebase_and_merge:
method = 'rebase & merge'
msg = build_message(pr.message, pr)
h = gh.rebase(pr.number, target, reset=True, commits=pr_commits)
new_heads[pr] = gh.merge(h, target, msg)['sha']
@ -974,6 +976,7 @@ class Batch(models.Model):
[base_commit] = merge
if base_commit:
method = 'merge/copy'
# replicate pr_head with base_commit replaced by
# the current head
original_head = gh.head(target)
@ -990,9 +993,11 @@ class Batch(models.Model):
gh.set_ref(target, copy['sha'])
new_heads[pr] = copy['sha']
else:
method = 'merge'
# otherwise do a regular merge
msg = build_message(pr.message, pr)
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])
except (exceptions.MergeError, AssertionError) as e:
_logger.exception("Failed to merge %s:%s into staging branch (error: %s)", pr.repository.name, pr.number, e)
pr.state = 'error'