diff --git a/lib/workers/repository/finalise/prune.js b/lib/workers/repository/finalise/prune.js index 591261ef8293d42befb400b601cd4681f552dfee..3c4d4a008cd5c1636295094dd8b6dc06da86bb3b 100644 --- a/lib/workers/repository/finalise/prune.js +++ b/lib/workers/repository/finalise/prune.js @@ -3,7 +3,6 @@ module.exports = { }; async function pruneStaleBranches(config, branchList) { - // TODO: try/catch logger.debug('Removing any stale branches'); logger.trace({ config }, `pruneStaleBranches`); logger.debug(`config.repoIsOnboarded=${config.repoIsOnboarded}`); @@ -41,13 +40,17 @@ async function pruneStaleBranches(config, branchList) { return; } for (const branchName of remainingBranches) { - logger.info({ branch: branchName }, `Deleting orphan branch`); - const pr = await platform.findPr(branchName, null, 'open'); - if (pr) { - await platform.updatePr(pr.number, `${pr.title} - autoclosed`); - logger.info({ prNo: pr.number, prTitle: pr.title }, 'PR autoclosed'); + try { + const pr = await platform.findPr(branchName, null, 'open'); + if (pr) { + await platform.updatePr(pr.number, `${pr.title} - autoclosed`); + logger.info({ prNo: pr.number, prTitle: pr.title }, 'PR autoclosed'); + } + const closePr = true; + await platform.deleteBranch(branchName, closePr); + logger.info({ branch: branchName }, `Deleting orphan branch`); + } catch (err) /* istanbul ignore next */ { + logger.warn({ err, branch: branchName }, 'Error pruning branch'); } - const closePr = true; - await platform.deleteBranch(branchName, closePr); } }