From 228b823e45febed8d8ad09479ed832511adca13a Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 9 Jan 2018 17:24:09 +0100
Subject: [PATCH] fix: ignore branchPrefix for onboarding branch
---
.../repository/onboarding/branch/check.js | 16 ++++------------
.../repository/onboarding/branch/create.js | 4 ++--
.../repository/onboarding/branch/index.js | 4 ++--
.../repository/onboarding/branch/rebase.js | 6 +++---
4 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/lib/workers/repository/onboarding/branch/check.js b/lib/workers/repository/onboarding/branch/check.js
index 702432b317..5e3f9e35ff 100644
--- a/lib/workers/repository/onboarding/branch/check.js
+++ b/lib/workers/repository/onboarding/branch/check.js
@@ -21,12 +21,8 @@ const packageJsonRenovateExists = async () => {
return false;
};
-const closedPrExists = config =>
- platform.findPr(
- `${config.branchPrefix}configure`,
- 'Configure Renovate',
- '!open'
- );
+const closedPrExists = () =>
+ platform.findPr(`renovate/configure`, 'Configure Renovate', '!open');
const isOnboarded = async config => {
logger.debug('isOnboarded()');
@@ -51,12 +47,8 @@ const isOnboarded = async config => {
return false;
};
-const onboardingPrExists = config =>
- platform.findPr(
- `${config.branchPrefix}configure`,
- 'Configure Renovate',
- 'open'
- );
+const onboardingPrExists = () =>
+ platform.findPr(`renovate/configure`, 'Configure Renovate', 'open');
module.exports = {
isOnboarded,
diff --git a/lib/workers/repository/onboarding/branch/create.js b/lib/workers/repository/onboarding/branch/create.js
index 458e5d3b9e..f5540a11a5 100644
--- a/lib/workers/repository/onboarding/branch/create.js
+++ b/lib/workers/repository/onboarding/branch/create.js
@@ -1,11 +1,11 @@
-async function createOnboardingBranch(config) {
+async function createOnboardingBranch() {
logger.debug('Creating onboarding branch');
const renovateJson = {
extends: ['config:base'],
};
logger.info({ renovateJson }, 'Creating onboarding branch');
await platform.commitFilesToBranch(
- `${config.branchPrefix}configure`,
+ `renovate/configure`,
[
{
name: 'renovate.json',
diff --git a/lib/workers/repository/onboarding/branch/index.js b/lib/workers/repository/onboarding/branch/index.js
index 3d2490ff9e..97e2a1981f 100644
--- a/lib/workers/repository/onboarding/branch/index.js
+++ b/lib/workers/repository/onboarding/branch/index.js
@@ -26,8 +26,8 @@ async function checkOnboardingBranch(config) {
logger.info('Need to create onboarding PR');
await createOnboardingBranch(config);
}
- await platform.setBaseBranch(`${config.branchPrefix}configure`);
- const branchList = [`${config.branchPrefix}configure`];
+ await platform.setBaseBranch(`renovate/configure`);
+ const branchList = [`renovate/configure`];
return { ...config, repoIsOnboarded, branchList };
}
diff --git a/lib/workers/repository/onboarding/branch/rebase.js b/lib/workers/repository/onboarding/branch/rebase.js
index 64ec98581b..08d63b83f9 100644
--- a/lib/workers/repository/onboarding/branch/rebase.js
+++ b/lib/workers/repository/onboarding/branch/rebase.js
@@ -1,6 +1,6 @@
-async function rebaseOnboardingBranch(config) {
+async function rebaseOnboardingBranch() {
logger.debug('Checking if onboarding branch needs rebasing');
- const prShort = await platform.getBranchPr(`${config.branchPrefix}configure`);
+ const prShort = await platform.getBranchPr(`renovate/configure`);
const pr = await platform.getPr(prShort.number);
if (!pr.isStale) {
logger.info('Onboarding branch is up to date');
@@ -9,7 +9,7 @@ async function rebaseOnboardingBranch(config) {
const renovateJson = {
extends: ['config:base'],
};
- const onboardingBranch = `${config.branchPrefix}configure`;
+ const onboardingBranch = `renovate/configure`;
let contents = JSON.stringify(renovateJson, null, 2) + '\n';
if (!pr.canRebase) {
const prFiles = await platform.getPrFiles(pr.number);
--
GitLab