From 5e3339aacb89b4a212adcd5e5dca72c5c144a47e Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Thu, 26 Apr 2018 14:06:36 +0200 Subject: [PATCH] feat: support commit prefix in onboarding commit (#1868) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR adds the capability so that the onboarding commit message (“Add renovate.jsonâ€) will have a prefix if semanticCommits is explicitly set to true by the bot administrator. e.g. “renovate a/b —semantic-commits=true —semantic-commit-type=foo†will result in the onboarding commit being “foobar: add renovate.jsonâ€. Closes #1867 --- lib/workers/repository/onboarding/branch/create.js | 14 +++++++++++++- lib/workers/repository/onboarding/branch/rebase.js | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/lib/workers/repository/onboarding/branch/create.js b/lib/workers/repository/onboarding/branch/create.js index f84107df6b..a4e58d0e96 100644 --- a/lib/workers/repository/onboarding/branch/create.js +++ b/lib/workers/repository/onboarding/branch/create.js @@ -4,6 +4,18 @@ async function createOnboardingBranch(config) { logger.debug('createOnboardingBranch()'); const contents = await getOnboardingConfig(config); logger.info('Creating onboarding branch'); + let commitMessage; + // istanbul ignore if + if (config.semanticCommits) { + commitMessage = config.semanticCommitType; + if (config.semanticCommitScope) { + commitMessage += `(${config.semanticCommitScope})`; + } + commitMessage += ': '; + commitMessage += 'add renovate.json'; + } else { + commitMessage = 'Add renovate.json'; + } await platform.commitFilesToBranch( `renovate/configure`, [ @@ -12,7 +24,7 @@ async function createOnboardingBranch(config) { contents, }, ], - 'Add renovate.json', + commitMessage, undefined, config.gitAuthor, config.gitPrivateKey diff --git a/lib/workers/repository/onboarding/branch/rebase.js b/lib/workers/repository/onboarding/branch/rebase.js index 746ec62558..723af80da5 100644 --- a/lib/workers/repository/onboarding/branch/rebase.js +++ b/lib/workers/repository/onboarding/branch/rebase.js @@ -18,6 +18,18 @@ async function rebaseOnboardingBranch(config) { return; } logger.info('Rebasing onboarding branch'); + let commitMessage; + // istanbul ignore if + if (config.semanticCommits) { + commitMessage = config.semanticCommitType; + if (config.semanticCommitScope) { + commitMessage += `(${config.semanticCommitScope})`; + } + commitMessage += ': '; + commitMessage += 'add renovate.json'; + } else { + commitMessage = 'Add renovate.json'; + } await platform.commitFilesToBranch( onboardingBranch, [ @@ -26,7 +38,7 @@ async function rebaseOnboardingBranch(config) { contents, }, ], - 'Add renovate.json', + commitMessage, undefined, config.gitAuthor, config.gitPrivateKey -- GitLab