From dde7d31975d09cbe00dbf47f7798f8cb09134000 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 6 May 2020 08:49:11 +0200
Subject: [PATCH] fix: ensure baseBranchSha is set
---
lib/workers/repository/init/base.ts | 3 +++
lib/workers/repository/init/index.ts | 1 +
2 files changed, 4 insertions(+)
diff --git a/lib/workers/repository/init/base.ts b/lib/workers/repository/init/base.ts
index ecce707b6f..79d41699cf 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 3745e6b1c9..71b12d8fc5 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);
--
GitLab