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

[FIX] runbot_merge: don't close PRs pointing to dummy commit

Browse Source 
e98a8caffb added dummy commits to the
heads of stagings and fixed most places to make a difference between
the staging head (including dummy commit) and the actual merge head,
but the difference was missed in the comment closing a PR, which was
still using the staging head and thus pointing to the dummy commit
e.g. (https://github.com/odoo/odoo/pull/26821#issuecomment-420244592)
This commit is contained in:
Xavier Morel 2018-09-11 13:53:41 +02:00
parent a0063f9df0
commit 2a7a3c6167
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runbot_merge/models/pull_requests.py
View File

@ -107,7 +107,8 @@ class Project(models.Model):
prs.write({'state': 'merged'})
for pr in prs:
# FIXME: this is the staging head rather than the actual merge commit for the PR
gh[pr.repository.name].close(pr.number, 'Merged in {}'.format(staging_heads[pr.repository.name]))
staging_head = staging_heads.get(pr.repository.name + '^') or staging_heads[pr.repository.name]
gh[pr.repository.name].close(pr.number, 'Merged in {}'.format(staging_head))
finally:
staging.batch_ids.write({'active': False})
staging.write({'active': False})