From c5cca2ed6435d18a2ba8a0eb313cec0a0ad7a173 Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Fri, 13 Dec 2019 15:56:21 +0100 Subject: [PATCH] fix(master-issue): bypass checks if master issue ticked --- lib/workers/branch/index.ts | 3 ++- lib/workers/pr/index.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/workers/branch/index.ts b/lib/workers/branch/index.ts index d11f92ba71..6c27807825 100644 --- a/lib/workers/branch/index.ts +++ b/lib/workers/branch/index.ts @@ -239,7 +239,7 @@ export async function processBranch( new Date(upgrade.releaseTimestamp).getTime()) / oneDay ); - if (daysElapsed < upgrade.stabilityDays) { + if (!masterIssueCheck && daysElapsed < upgrade.stabilityDays) { logger.debug( { depName: upgrade.depName, @@ -254,6 +254,7 @@ export async function processBranch( } // Don't create a branch if we know it will be status 'pending' if ( + !masterIssueCheck && !branchExists && config.stabilityStatus === 'pending' && ['not-pending', 'status-success'].includes(config.prCreation) diff --git a/lib/workers/pr/index.ts b/lib/workers/pr/index.ts index 915810d19c..8a08faf529 100644 --- a/lib/workers/pr/index.ts +++ b/lib/workers/pr/index.ts @@ -155,7 +155,7 @@ export async function ensurePr( const elapsedHours = Math.round( (currentTime.getTime() - lastCommitTime.getTime()) / millisecondsPerHour ); - if (elapsedHours < config.prNotPendingHours) { + if (!masterIssueCheck && elapsedHours < config.prNotPendingHours) { logger.debug( `Branch is ${elapsedHours} hours old - skipping PR creation` ); -- GitLab