From ed99d0b2defc43e11f749fcbe58c62cd8e8b5e13 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 5 Dec 2017 06:43:23 +0100
Subject: [PATCH] refactor: handle mergePr 405 errors specially
---
lib/platform/github/index.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/platform/github/index.js b/lib/platform/github/index.js
index 28f3b9e266..a0729314e3 100644
--- a/lib/platform/github/index.js
+++ b/lib/platform/github/index.js
@@ -628,7 +628,12 @@ async function mergePr(prNo, branchName) {
logger.debug({ options, url }, `mergePr`);
await get.put(url, options);
} catch (err) {
- logger.error({ err }, `Failed to ${options.body.merge_method} PR`);
+ if (err.statusCode === 405) {
+ // istanbul ignore next
+ logger.info('GitHub blocking PR merge');
+ } else {
+ logger.warn({ err }, `Failed to ${options.body.merge_method} PR`);
+ }
return false;
}
} else {
--
GitLab