mirror of
https://github.com/odoo/runbot.git
synced 2025-03-15 23:45:44 +07:00
[IMP] runbot_merge: add PR ID to commit message when merging
This commit is contained in:
parent
ea9203c359
commit
e6f5b84a19
@ -693,6 +693,8 @@ class Batch(models.Model):
|
||||
msg = commit['message']
|
||||
author = commit['author']
|
||||
|
||||
msg += '\n\ncloses {pr.repository.name}#{pr.number}'.format(pr=pr)
|
||||
|
||||
try:
|
||||
new_heads[pr] = gh.merge(pr.head, 'tmp.{}'.format(pr.target.name), msg, squash=pr.squash, author=author)['sha']
|
||||
except exceptions.MergeError:
|
||||
|
@ -78,6 +78,7 @@ def test_trivial_flow(env, repo):
|
||||
'a': b'some other content',
|
||||
'b': b'a second file',
|
||||
}
|
||||
assert master.message, "gibberish\n\nblahblah\n\ncloses odoo/odoo#1"
|
||||
|
||||
def test_staging_conflict(env, repo):
|
||||
# create base branch
|
||||
|
Loading…
Reference in New Issue
Block a user