fix: ignore branchPrefix for onboarding branch

pull/1367/head v10.46.4
Rhys Arkins 2018-01-09 17:24:09 +01:00
parent 0a1b905b0e
commit 228b823e45
4 changed files with 11 additions and 19 deletions
lib/workers/repository/onboarding/branch

View File

@ -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,

View File

@ -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',

View File

@ -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 };
}

View File

@ -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);