diff --git a/lib/workers/branch/index.js b/lib/workers/branch/index.js index 81b03cd0f836c9b428a68b6bbfc351206621be5a..fc55bdbc6b962d92cc08a58955ec04c0ee9eae80 100644 --- a/lib/workers/branch/index.js +++ b/lib/workers/branch/index.js @@ -16,7 +16,7 @@ module.exports = { processBranch, }; -async function processBranch(branchConfig, packageFiles) { +async function processBranch(branchConfig, prHourlyLimitReached, packageFiles) { logger.debug(`processBranch with ${branchConfig.upgrades.length} upgrades`); const config = { ...branchConfig }; const dependencies = config.upgrades @@ -33,7 +33,7 @@ async function processBranch(branchConfig, packageFiles) { await platform.setBaseBranch(config.baseBranch); const branchExists = await platform.branchExists(config.branchName); logger.debug(`branchExists=${branchExists}`); - if (!branchExists && config.prHourlyLimitReached) { + if (!branchExists && prHourlyLimitReached) { logger.info('Reached PR creation limit - skipping branch creation'); return 'pr-hourly-limit-reached'; } diff --git a/lib/workers/repository/process/write.js b/lib/workers/repository/process/write.js index ef08616571ea77f65174a43ca1f13f2f9594a3fd..9fa0bc58777a2409e2a0ca3dc589978dc6a337ad 100644 --- a/lib/workers/repository/process/write.js +++ b/lib/workers/repository/process/write.js @@ -25,12 +25,11 @@ async function writeUpdates(config, packageFiles, allBranches) { let prsRemaining = await getPrsRemaining(config, branches); for (const branch of branches) { const res = await branchWorker.processBranch( - { - ...branch, - prHourlyLimitReached: prsRemaining <= 0, - }, + branch, + prsRemaining <= 0, packageFiles ); + branch.res = res; if (res === 'pr-closed' || res === 'automerged') { // Stop procesing other branches because base branch has been changed return res; diff --git a/test/workers/branch/index.spec.js b/test/workers/branch/index.spec.js index fcc461dc4ce77a40facb2893f6f3a1ed71fd6efb..147597dabe05aedbb8dceb1d222cce949d09db6e 100644 --- a/test/workers/branch/index.spec.js +++ b/test/workers/branch/index.spec.js @@ -155,8 +155,7 @@ describe('workers/branch', () => { updatedLockFiles: [], }); platform.branchExists.mockReturnValue(false); - config.prHourlyLimitReached = true; - expect(await branchWorker.processBranch(config)).toEqual( + expect(await branchWorker.processBranch(config, true)).toEqual( 'pr-hourly-limit-reached' ); });