stonehenge: install marge bot and renovate bot
This commit is contained in:
parent
b6415a9d8f
commit
afe1dc40fc
11 changed files with 894 additions and 2 deletions
13
pkgs/marge-bot/patches/wait-for-mr-update.patch
Normal file
13
pkgs/marge-bot/patches/wait-for-mr-update.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git i/marge/batch_job.py w/marge/batch_job.py
|
||||
index b6423d8..3db302f 100644
|
||||
--- i/marge/batch_job.py
|
||||
+++ w/marge/batch_job.py
|
||||
@@ -205,6 +205,8 @@ class BatchMergeJob(job.MergeJob):
|
||||
# Rebase and apply the trailers
|
||||
self.update_merge_request(merge_request, source_repo_url=source_repo_url)
|
||||
|
||||
+ time.sleep(10)
|
||||
+
|
||||
# This switches git to <target_branch>
|
||||
final_sha = self.merge_batch(
|
||||
merge_request.target_branch,
|
||||
Loading…
Add table
Add a link
Reference in a new issue