Skip to content
Snippets Groups Projects
Commit 5639f4b6 authored by Rhys Arkins's avatar Rhys Arkins Committed by GitHub
Browse files

fix: move renovate repository inner inside outer function (#977)

This solves the missing config.api problem introduced when moving to recursion
parent dd43fb32
No related branches found
No related tags found
No related merge requests found
...@@ -24,9 +24,14 @@ function pinDependenciesFirst(a, b) { ...@@ -24,9 +24,14 @@ function pinDependenciesFirst(a, b) {
return a.branchName > b.branchName; return a.branchName > b.branchName;
} }
async function renovateRepositoryInner(repoConfig, token, count = 1) { async function renovateRepository(repoConfig, token) {
let config = { ...repoConfig }; let config = { ...repoConfig };
const { logger } = config; const { logger } = config;
logger.trace({ config }, 'renovateRepository');
config.tmpDir = tmp.dirSync({ unsafeCleanup: true });
config.errors = [];
config.warnings = [];
async function renovateRepositoryInner(count = 1) {
// istanbul ignore if // istanbul ignore if
if (count > 5) { if (count > 5) {
// This is an arbitrary number added in to cut short any unintended infinite recursion // This is an arbitrary number added in to cut short any unintended infinite recursion
...@@ -122,7 +127,7 @@ async function renovateRepositoryInner(repoConfig, token, count = 1) { ...@@ -122,7 +127,7 @@ async function renovateRepositoryInner(repoConfig, token, count = 1) {
if (branchResult === 'automerged') { if (branchResult === 'automerged') {
// Stop procesing other branches because base branch has been changed by an automerge // Stop procesing other branches because base branch has been changed by an automerge
logger.info('Restarting repo renovation after automerge'); logger.info('Restarting repo renovation after automerge');
return renovateRepositoryInner(repoConfig, token, count + 1); return renovateRepositoryInner(count + 1);
} else if (branchResult === 'lockFileError') { } else if (branchResult === 'lockFileError') {
logger.info('Lock file error - stopping branch updates'); logger.info('Lock file error - stopping branch updates');
return branchList; return branchList;
...@@ -145,16 +150,8 @@ async function renovateRepositoryInner(repoConfig, token, count = 1) { ...@@ -145,16 +150,8 @@ async function renovateRepositoryInner(repoConfig, token, count = 1) {
logger.debug(`branchList=${branchList}`); logger.debug(`branchList=${branchList}`);
return branchList; return branchList;
} }
async function renovateRepository(repoConfig, token) {
const config = { ...repoConfig };
const { logger } = config;
logger.trace({ config }, 'renovateRepository');
config.tmpDir = tmp.dirSync({ unsafeCleanup: true });
config.errors = [];
config.warnings = [];
try { try {
const branchList = await renovateRepositoryInner(config, token); const branchList = await renovateRepositoryInner();
if (branchList) { if (branchList) {
await cleanup.pruneStaleBranches(config, branchList); await cleanup.pruneStaleBranches(config, branchList);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment