From cdd734d5d236002025444cdd758bd88cb3951cc8 Mon Sep 17 00:00:00 2001 From: Jens Reimann Date: Fri, 26 Jan 2024 16:43:20 +0100 Subject: [PATCH] ci: fixup convco templates --- .convco/template/commit.hbs | 21 +++++++++------------ .convco/template/header.hbs | 2 +- .convco/template/template.hbs | 7 +++---- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.convco/template/commit.hbs b/.convco/template/commit.hbs index 8dd1ab3..909f5f5 100644 --- a/.convco/template/commit.hbs +++ b/.convco/template/commit.hbs @@ -1,14 +1,11 @@ -* -{{~#if scope}} **{{scope}}:** -{{~/if}} -{{#if references}} - {{~#each references}} {{#if @root.linkReferences~}} - [{{this.prefix}}{{this.issue}}]({{issueUrlFormat}}) - {{~else}}{{this.prefix}}{{this.issue}} - {{~/if}}{{/each}} -{{~/if}} - {{subject}} -{{~#if hash}} {{#if @root.linkReferences}}([{{shortHash}}]({{commitUrlFormat}})){{else}}({{shortHash}}) -{{~/if}} +{{#word-wrap}} +*{{#if scope}} **{{scope}}:**{{/if}} {{subject}} +{{~#if hash}} {{#if @root.linkReferences}}([{{shortHash}}]({{commitUrlFormat}})){{else}}({{shortHash}}){{/if}}{{/if}} +{{~#if references}}, closes + {{~#each references}} {{#if @root.linkReferences~}} + [{{this.prefix}}{{this.issue}}]({{issueUrlFormat}}) + {{~else}}{{this.prefix}}{{this.issue}} + {{~/if}}{{/each}} {{~/if}} +{{/word-wrap}} diff --git a/.convco/template/header.hbs b/.convco/template/header.hbs index a4659a6..317d2a1 100644 --- a/.convco/template/header.hbs +++ b/.convco/template/header.hbs @@ -1,2 +1,2 @@ -{{#if isPatch}}###{{else}}##{{/if}}{{#if @root.linkCompare}} [{{version}}]({{compareUrlFormat}}){{else}} {{version}}{{/if}}{{#if title}} "{{title}}"{{/if}}{{#if date}} ({{date}}){{/if}} \ No newline at end of file +{{#if isPatch}}###{{else}}##{{/if}}{{#if @root.linkCompare}} [{{version}}]({{compareUrlFormat}}){{else}} {{version}}{{/if}}{{#if title}} "{{title}}"{{/if}}{{#if date}} ({{date}}){{/if}} diff --git a/.convco/template/template.hbs b/.convco/template/template.hbs index de02597..42cedf1 100644 --- a/.convco/template/template.hbs +++ b/.convco/template/template.hbs @@ -1,10 +1,9 @@ {{> header}} {{#if noteGroups}}{{#each noteGroups}} -### ⚠ {{title}} +### ⚠️ {{title}} -{{#each notes}}* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{#each text}}{{this}} -{{~/each}} +{{#each notes}}* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{this.text}} {{/each}} {{/each}} {{/if}} @@ -17,4 +16,4 @@ {{#each commits}} {{> commit root=@root}} {{/each}} -{{/each}} \ No newline at end of file +{{/each}}