From e7e48ccc8cf5d78e34f035d81d3641893d16f22b Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 3 Oct 2018 16:01:57 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20don=E2=80=99t=20skip=20branch=20if=20bra?=
=?UTF-8?q?nchPr=20found?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/workers/branch/index.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/workers/branch/index.js b/lib/workers/branch/index.js
index 20b695f525..a870e3f7d9 100644
--- a/lib/workers/branch/index.js
+++ b/lib/workers/branch/index.js
@@ -32,6 +32,7 @@ async function processBranch(branchConfig, prHourlyLimitReached, packageFiles) {
logger.trace({ config });
await platform.setBaseBranch(config.baseBranch);
const branchExists = await platform.branchExists(config.branchName);
+ const branchPr = await platform.getBranchPr(config.branchName);
logger.debug(`branchExists=${branchExists}`);
try {
logger.debug(
@@ -39,7 +40,7 @@ async function processBranch(branchConfig, prHourlyLimitReached, packageFiles) {
);
// Check if branch already existed
- const existingPr = await prAlreadyExisted(config);
+ const existingPr = branchPr ? undefined : await prAlreadyExisted(config);
if (existingPr) {
logger.debug(
{ prTitle: config.prTitle },
@@ -79,14 +80,12 @@ async function processBranch(branchConfig, prHourlyLimitReached, packageFiles) {
}
return 'already-existed';
}
- let branchPr;
if (!branchExists && prHourlyLimitReached) {
logger.info('Reached PR creation limit - skipping branch creation');
return 'pr-hourly-limit-reached';
}
if (branchExists) {
logger.debug('Checking if PR has been edited');
- branchPr = await platform.getBranchPr(config.branchName);
if (branchPr) {
logger.debug('Found existing branch PR');
if (branchPr.state !== 'open') {
--
GitLab