fix(github): try automerge even if push protection is enabled

Closes #4460
This commit is contained in:
Rhys Arkins 2019-09-10 09:29:20 +02:00
parent bcc6536cc2
commit 88d889a979

View file

@ -1617,7 +1617,7 @@ export async function updatePr(prNo: number, title: string, rawBody?: string) {
export async function mergePr(prNo: number, branchName: string) { export async function mergePr(prNo: number, branchName: string) {
logger.debug(`mergePr(${prNo}, ${branchName})`); logger.debug(`mergePr(${prNo}, ${branchName})`);
// istanbul ignore if // istanbul ignore if
if (config.pushProtection) { if (config.isGhe && config.pushProtection) {
logger.info( logger.info(
{ branch: branchName, prNo }, { branch: branchName, prNo },
'Branch protection: Cannot automerge PR when push protection is enabled' 'Branch protection: Cannot automerge PR when push protection is enabled'