From 97fc3e61356c82f7d4006e705cc8b3d2bd91100b Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Thu, 28 Dec 2017 17:19:59 +0100
Subject: [PATCH] fix: pr should be ensured if branch automerge previously
failed
If branch automerge *previously* failed, then still make sure we are keeping the PR up to date.
Closes #1336
---
lib/workers/branch/index.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/workers/branch/index.js b/lib/workers/branch/index.js
index 6b50581beb..c3f69a4cb7 100644
--- a/lib/workers/branch/index.js
+++ b/lib/workers/branch/index.js
@@ -135,7 +135,11 @@ async function processBranch(branchConfig) {
if (mergeStatus === 'automerged') {
logger.debug('Branch is automerged - returning');
return 'automerged';
- } else if (mergeStatus === 'failed') {
+ } else if (
+ mergeStatus === 'automerge aborted - PR exists' ||
+ mergeStatus === 'failed'
+ ) {
+ logger.info({ mergeStatus }, 'Branch automerge not possible');
config.forcePr = true;
}
} catch (err) {
--
GitLab