diff --git a/lib/workers/repository/init/base.ts b/lib/workers/repository/init/base.ts index ecce707b6f4f29005795a8e9cbd7a838a3f4ed2b..79d41699cf53ad5be02a88628a22b4dbe85daf28 100644 --- a/lib/workers/repository/init/base.ts +++ b/lib/workers/repository/init/base.ts @@ -9,6 +9,7 @@ export async function checkBaseBranch( logger.debug(`config.repoIsOnboarded=${config.repoIsOnboarded}`); let error = []; let baseBranchSha: string; + // istanbul ignore else if (config.baseBranch) { // Read content and target PRs here if (await platform.branchExists(config.baseBranch)) { @@ -24,6 +25,8 @@ export async function checkBaseBranch( ]; logger.warn(message); } + } else { + baseBranchSha = await platform.setBaseBranch(); } return { ...config, errors: config.errors.concat(error), baseBranchSha }; } diff --git a/lib/workers/repository/init/index.ts b/lib/workers/repository/init/index.ts index 3745e6b1c9781787742bbbffd0381c220c802f24..71b12d8fc520258fa37dcc1bd45164dd1a24765d 100644 --- a/lib/workers/repository/init/index.ts +++ b/lib/workers/repository/init/index.ts @@ -21,6 +21,7 @@ export async function initRepo(input: RenovateConfig): Promise<RenovateConfig> { config.global = config.global || {}; config = await initApis(config); config.semanticCommits = await detectSemanticCommits(config); + config.baseBranchSha = await platform.setBaseBranch(config.baseBranch); config = await checkOnboardingBranch(config); config = await mergeRenovateConfig(config); checkIfConfigured(config);