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: p=1 > split

Browse Source 
Allows merging a fix for e.g. a common false positive during a split
but without cancelling a staging which might just pass (you never
know).
This commit is contained in:
xmo-odoo 2019-07-31 09:19:28 +02:00 committed by GitHub
parent dcf3297bff
commit 955b97a023
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runbot_merge/models/pull_requests.py
View File

@ -316,18 +316,21 @@ class Branch(models.Model):
rows = self._stageable() rows = self._stageable()
priority = rows[0][0] if rows else -1 priority = rows[0][0] if rows else -1
if priority == 0: if priority == 0 or priority == 1:
# p=0 take precedence over all else # p=0 take precedence over all else
# p=1 allows merging a fix inside / ahead of a split (e.g. branch
# is broken or widespread false positive) without having to cancel
# the existing staging
batched_prs = [PRs.browse(pr_ids) for _, pr_ids in takewhile(lambda r: r[0] == priority, rows)] batched_prs = [PRs.browse(pr_ids) for _, pr_ids in takewhile(lambda r: r[0] == priority, rows)]
elif self.split_ids: elif self.split_ids:
split_ids = self.split_ids[0] split_ids = self.split_ids[0]
logger.info("Found split of PRs %s, re-staging", split_ids.mapped('batch_ids.prs')) logger.info("Found split of PRs %s, re-staging", split_ids.mapped('batch_ids.prs'))
batched_prs = [batch.prs for batch in split_ids.batch_ids] batched_prs = [batch.prs for batch in split_ids.batch_ids]
split_ids.unlink() split_ids.unlink()
elif rows: else: # p=2
# p=1 or p=2
batched_prs = [PRs.browse(pr_ids) for _, pr_ids in takewhile(lambda r: r[0] == priority, rows)] batched_prs = [PRs.browse(pr_ids) for _, pr_ids in takewhile(lambda r: r[0] == priority, rows)]
else:
if not batched_prs:
return return
Batch = self.env['runbot_merge.batch'] Batch = self.env['runbot_merge.batch']