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

[FIX] runbot_merge: only update pending staging state

Browse Source 
The staging validation routine would ignore stagings which were
cancelled or ff_failed, but it should also have ignored failed and
successful aka all terminal state.

Simplify the condition for that: just ignore a staging's validation if
the staging is not pending.

Closes #211
This commit is contained in:
Xavier Morel 2019-09-27 14:59:37 +02:00 committed by xmo-odoo
parent cd29c648e8
commit e49b112447
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot_merge/models/pull_requests.py
View File

@ -1311,7 +1311,7 @@ class Stagings(models.Model):
('pending', 'Pending'), ('pending', 'Pending'),
('cancelled', "Cancelled"), ('cancelled', "Cancelled"),
('ff_failed', "Fast forward failed") ('ff_failed', "Fast forward failed")
]) ], default='pending')
active = fields.Boolean(default=True) active = fields.Boolean(default=True)
staged_at = fields.Datetime(default=fields.Datetime.now) staged_at = fields.Datetime(default=fields.Datetime.now)
@ -1362,7 +1362,7 @@ class Stagings(models.Model):
def _validate(self): def _validate(self):
Commits = self.env['runbot_merge.commit'] Commits = self.env['runbot_merge.commit']
for s in self: for s in self:
if s.state in ('cancelled', 'ff_failed'): if s.state != 'pending':
continue continue
heads = [ heads = [