From e9eba859ea0aed7248c69c8dc67fcda6d50b014a Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Thu, 1 Mar 2018 21:34:27 +0100
Subject: [PATCH] fix: use original branchPrefix when pruning baseBranches
---
lib/workers/repository/cleanup.js | 2 ++
lib/workers/repository/index.js | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/workers/repository/cleanup.js b/lib/workers/repository/cleanup.js
index f1c921b24b..e96707a959 100644
--- a/lib/workers/repository/cleanup.js
+++ b/lib/workers/repository/cleanup.js
@@ -12,10 +12,12 @@ async function pruneStaleBranches(config) {
logger.debug('No branchList');
return;
}
+ logger.debug({ branchList }, 'branchList');
let renovateBranches = await platform.getAllRenovateBranches(
config.branchPrefix
);
if (!(renovateBranches && renovateBranches.length)) {
+ logger.debug('No renovate branches found');
return;
}
logger.debug({ branchList, renovateBranches });
diff --git a/lib/workers/repository/index.js b/lib/workers/repository/index.js
index b451acf8f1..7abc1b1937 100644
--- a/lib/workers/repository/index.js
+++ b/lib/workers/repository/index.js
@@ -18,6 +18,7 @@ async function renovateRepository(repoConfig, token, loop = 1) {
logger.setMeta({ repository: config.repository });
logger.info('Renovating repository');
logger.trace({ config, loop }, 'renovateRepository()');
+ let commonConfig;
try {
if (loop > 5) {
throw new Error('loops>5');
@@ -28,7 +29,7 @@ async function renovateRepository(repoConfig, token, loop = 1) {
if (config.baseBranches && config.baseBranches.length) {
// At this point we know if we have multiple branches
// Do the following for every branch
- const commonConfig = JSON.parse(JSON.stringify(config));
+ commonConfig = JSON.parse(JSON.stringify(config));
const configs = [];
logger.info({ baseBranches: config.baseBranches }, 'baseBranches');
for (const [index, baseBranch] of commonConfig.baseBranches.entries()) {
@@ -84,6 +85,7 @@ async function renovateRepository(repoConfig, token, loop = 1) {
return handleError(config, err);
} finally {
logger.setMeta({ repository: config.repository });
+ config.branchPrefix = commonConfig.branchPrefix;
await pruneStaleBranches(config);
logger.info('Finished repository');
}
--
GitLab