renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

refactor: simplify patch branch name

Browse source
This commit is contained in:
Rhys Arkins 2018-07-05 18:21:43 +02:00
parent 85e40963a0
commit 13f09b9f36
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/config/definitions.js
View file

@ -545,9 +545,7 @@ const options = [
'Configuration to apply when an update type is patch. Only applies if `separateMinorPatch` is set to true', 'Configuration to apply when an update type is patch. Only applies if `separateMinorPatch` is set to true',
stage: 'package', stage: 'package',
type: 'json', type: 'json',
default: { default: {},
branchTopic: '{{{depNameSanitized}}}-{{{newMajor}}}.{{{newMinor}}}.x',
},
cli: false, cli: false,
mergeable: true, mergeable: true,
}, },
@ -702,7 +700,8 @@ const options = [
name: 'branchTopic', name: 'branchTopic',
description: 'Branch topic', description: 'Branch topic',
type: 'string', type: 'string',
default: '{{{depNameSanitized}}}-{{{newMajor}}}.x', default:
'{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x',
cli: false, cli: false,
}, },
{ {

6
test/workers/repository/updates/__snapshots__/flatten.spec.js.snap
View file

@ -9,7 +9,7 @@ Array [
"automergeType": "pr", "automergeType": "pr",
"branchName": "{{{branchPrefix}}}{{{managerBranchPrefix}}}{{{branchTopic}}}", "branchName": "{{{branchPrefix}}}{{{managerBranchPrefix}}}{{{branchTopic}}}",
"branchPrefix": "renovate/", "branchPrefix": "renovate/",
"branchTopic": "{{{depNameSanitized}}}-{{{newMajor}}}.x", "branchTopic": "{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x",
"bumpVersion": null, "bumpVersion": null,
"commitBody": null, "commitBody": null,
"commitMessage": "{{{commitMessagePrefix}}} {{{commitMessageAction}}} {{{commitMessageTopic}}} {{{commitMessageExtra}}} {{{commitMessageSuffix}}}", "commitMessage": "{{{commitMessagePrefix}}} {{{commitMessageAction}}} {{{commitMessageTopic}}} {{{commitMessageExtra}}} {{{commitMessageSuffix}}}",
@ -82,7 +82,7 @@ Array [
"automergeType": "pr", "automergeType": "pr",
"branchName": "{{{branchPrefix}}}{{{managerBranchPrefix}}}{{{branchTopic}}}", "branchName": "{{{branchPrefix}}}{{{managerBranchPrefix}}}{{{branchTopic}}}",
"branchPrefix": "renovate/", "branchPrefix": "renovate/",
"branchTopic": "{{{depNameSanitized}}}-{{{newMajor}}}.x", "branchTopic": "{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x",
"bumpVersion": null, "bumpVersion": null,
"commitBody": null, "commitBody": null,
"commitMessage": "{{{commitMessagePrefix}}} {{{commitMessageAction}}} {{{commitMessageTopic}}} {{{commitMessageExtra}}} {{{commitMessageSuffix}}}", "commitMessage": "{{{commitMessagePrefix}}} {{{commitMessageAction}}} {{{commitMessageTopic}}} {{{commitMessageExtra}}} {{{commitMessageSuffix}}}",
@ -226,7 +226,7 @@ Array [
"automergeType": "pr", "automergeType": "pr",
"branchName": "{{{branchPrefix}}}{{{managerBranchPrefix}}}{{{branchTopic}}}", "branchName": "{{{branchPrefix}}}{{{managerBranchPrefix}}}{{{branchTopic}}}",
"branchPrefix": "renovate/", "branchPrefix": "renovate/",
"branchTopic": "{{{depNameSanitized}}}-{{{newMajor}}}.x", "branchTopic": "{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x",
"bumpVersion": null, "bumpVersion": null,
"commitBody": null, "commitBody": null,
"commitMessage": "{{{commitMessagePrefix}}} {{{commitMessageAction}}} {{{commitMessageTopic}}} {{{commitMessageExtra}}} {{{commitMessageSuffix}}}", "commitMessage": "{{{commitMessagePrefix}}} {{{commitMessageAction}}} {{{commitMessageTopic}}} {{{commitMessageExtra}}} {{{commitMessageSuffix}}}",