From 4eaf3f82668d2c53dc37f7156f87d267e2e4ba4c Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 16 Oct 2018 21:02:16 +0200
Subject: [PATCH] fix: better catch pr validation errors
---
lib/workers/repository/finalise/validate.js | 28 ++++++++++++++-------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/lib/workers/repository/finalise/validate.js b/lib/workers/repository/finalise/validate.js
index 1d4848331e..2ae1720b86 100644
--- a/lib/workers/repository/finalise/validate.js
+++ b/lib/workers/repository/finalise/validate.js
@@ -36,7 +36,12 @@ async function validatePrs(config) {
'PR has renovate files'
);
for (const file of renovateFiles) {
- const content = await platform.getFile(file, pr.sha || pr.branchName);
+ let content;
+ try {
+ content = await platform.getFile(file, pr.sha || pr.branchName);
+ } catch (err) /* istanbul ignore next */ {
+ content = await platform.getFile(file, pr.branchName);
+ }
let parsed;
try {
parsed = JSON.parse(content);
@@ -95,14 +100,19 @@ async function validatePrs(config) {
logger.debug('Skipping branch status for forked PR');
}
} catch (err) {
- logger.warn(
- {
- err,
- prNo: pr.number,
- branchName: pr.branchName,
- },
- 'Error checking PR'
- );
+ // istanbul ignore if
+ if (err.message === 'repository-changed') {
+ logger.info('Cannot access PR files to check them');
+ } else {
+ logger.warn(
+ {
+ err,
+ prNo: pr.number,
+ branchName: pr.branchName,
+ },
+ 'Error checking PR'
+ );
+ }
}
}
}
--
GitLab