Merge branch 'next'

Author: Christopher - Marcel Böddecker

CHANGELOG.md

@@ -13,6 +13,16 @@
 ## [3.9.0-next.1](https://github.com/ExtendRealityLtd/DevOps/compare/v3.8.0...v3.9.0-next.1) (2019-10-14)
 
 
+#### Features
+
+* **templates:** pretty, sorted changelog/release notes in CD ([763cf1d](https://github.com/ExtendRealityLtd/DevOps/commit/763cf1dbc04060bf5e289cdad94fb4f4a19936bf))
+#### Bug Fixes
+
+* **templates:** CD failure when commit body is empty ([34f4c71](https://github.com/ExtendRealityLtd/DevOps/commit/34f4c71f6282c624868a6d5c5ff38fa2e7c8088d))* **templates:** changelog/release note breaking change formatting ([7efda24](https://github.com/ExtendRealityLtd/DevOps/commit/7efda24500c52da0a262f549ed32a30c9200419a))* **templates:** release pre-release packages on the default channel ([fdc9579](https://github.com/ExtendRealityLtd/DevOps/commit/fdc9579d621250041d02fe13bdc2a9a0ba614ed8))* **templates:** remove release commits from changelog/release note ([cb47e13](https://github.com/ExtendRealityLtd/DevOps/commit/cb47e13133a89ab531866c37fde1b8ec2eb420e7))
+
+## [3.9.0-next.1](https://github.com/ExtendRealityLtd/DevOps/compare/v3.8.0...v3.9.0-next.1) (2019-10-14)
+
+
 #### Features
 
 * **templates:** pretty, sorted changelog/release notes in CD ([763cf1d](https://github.com/ExtendRealityLtd/DevOps/commit/763cf1dbc04060bf5e289cdad94fb4f4a19936bf))

templates/steps/cd.yml

@@ -135,10 +135,17 @@ steps:
             writerOpts: {
               finalizeContext: (context) => {
                 const prefix = '  > '
+                context.noteGroups.forEach(group => {
+                  group.notes.forEach(note => {
+                    if (note.text) {
+                      note.text = note.text.split('\n\n').map(paragraph => paragraph.split('\n').join(' ')).join('\n\n')
+                    }
+                  })
+                })
                 context.commitGroups.forEach(group => {
                   group.commits.forEach(commit => {
                     if (commit.body) {
-                      commit.body = prefix + commit.body.split('\n').join('\n' + prefix)
+                      commit.body = prefix + commit.body.split('\n\n').map(paragraph => paragraph.split('\n').join(' ')).join('\n' + prefix + '\n' + prefix)
                     }
                   })
                   group.commits = group.commits.filter(commit => !(commit.type == 'Miscellaneous Chores' && commit.scope == 'release'))
@@ -148,9 +155,9 @@ steps:
               },
               mainTemplate: `
       {{> header}}
-
       {{#if noteGroups}}
       {{#each noteGroups}}
+
       #### :warning: {{title}} :warning:
 
       {{#each notes}}
@@ -177,15 +184,15 @@ steps:
       {{/each}}
       {{/if}}
 
-      {{#each commitGroups}}
+      {{~#each commitGroups}}
       {{#if title}}
+
       #### {{title}}
 
       {{/if}}
       {{#each commits}}
       {{> commit root=@root}}
       {{/each}}
-
       {{/each}}
       `,
               commitPartial: `*{{#if scope}} **{{scope}}:**
@@ -249,8 +256,7 @@ steps:
         {{~/if}}{{/each}}
       {{~/if}}
 
-      {{~#if body}}
-
+      {{#if body}}
       {{body}}
       {{/if}}
       `,