From 9c9b312f8a8a21ed8a3970768a84bd7453a42762 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 9 Aug 2019 14:31:21 +0200 Subject: [PATCH] [ADD] runbot_merge: staging dependencies --- runbot_merge/models/pull_requests.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index ca867775..a6358234 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -357,8 +357,15 @@ class Branch(models.Model): # ensures staging branches are unique and always # rebuilt r = base64.b64encode(os.urandom(12)).decode('ascii') + trailer = '' + if heads: + trailer = '\n' + '\n'.join( + 'Runbot-dependency: %s:%s' % (repo, h) + for repo, h in heads.items() + if not repo.endswith('^') + ) dummy_head = it['gh']('post', 'git/commits', json={ - 'message': 'force rebuild\n\nuniquifier: %s' % r, + 'message': 'force rebuild\n\nuniquifier: %s%s' % (r, trailer), 'tree': tree['sha'], 'parents': [it['head']], }).json()