From 7ae3b05264970126a914a14bd83e9c2634c95ace Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 9 May 2021 23:33:29 +0200 Subject: [PATCH] chore: improve generated changelog --- .chglog/CHANGELOG.tpl.md | 6 +++++- .drone.jsonnet | 11 +++++++++-- .drone.yml | 11 ++++++++--- .prettierignore | 2 ++ 4 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 .prettierignore diff --git a/.chglog/CHANGELOG.tpl.md b/.chglog/CHANGELOG.tpl.md index 95a8415..3f7457d 100755 --- a/.chglog/CHANGELOG.tpl.md +++ b/.chglog/CHANGELOG.tpl.md @@ -6,10 +6,14 @@ {{ range .CommitGroups -}} ### {{ .Title }} +{{ $subjects := list }} {{ range .Commits -}} +{{ if not (has .Subject $subjects) -}} - {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} +{{ $subjects = append $subjects .Subject -}} {{ end }} -{{ end -}} +{{- end }} +{{- end -}} {{- if .NoteGroups -}} {{ range .NoteGroups -}} diff --git a/.drone.jsonnet b/.drone.jsonnet index 0232e58..a0c8ea3 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -116,14 +116,21 @@ local PipelineBuildBinaries = { ], }, { - name: 'changelog', + name: 'changelog-generate', image: 'thegeeklab/git-chglog', commands: [ 'git fetch -tq', - 'git-chglog --no-color --no-emoji ${DRONE_TAG:---next-tag unreleased unreleased}', 'git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}', ], }, + { + name: 'changelog-format', + image: 'thegeeklab/alpine-tools', + commands: [ + 'prettier CHANGELOG.md', + 'prettier -w CHANGELOG.md', + ], + }, { name: 'publish', image: 'plugins/github-release', diff --git a/.drone.yml b/.drone.yml index fa5772a..5ec0497 100644 --- a/.drone.yml +++ b/.drone.yml @@ -87,13 +87,18 @@ steps: commands: - cd release/ && sha256sum * > sha256sum.txt -- name: changelog +- name: changelog-generate image: thegeeklab/git-chglog commands: - git fetch -tq - - git-chglog --no-color --no-emoji ${DRONE_TAG:---next-tag unreleased unreleased} - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased} +- name: changelog-format + image: thegeeklab/alpine-tools + commands: + - prettier CHANGELOG.md + - prettier -w CHANGELOG.md + - name: publish image: plugins/github-release settings: @@ -476,6 +481,6 @@ depends_on: --- kind: signature -hmac: e0af5cf53442daccc9ef1a29e947b4e7ca4bfc59d600f9c6351ac183411cc83f +hmac: 08eb30285f9ca0925121fbe966406bb353f1c69f22ad72a16ce1932c5f32ab35 ... diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..97e0b3e --- /dev/null +++ b/.prettierignore @@ -0,0 +1,2 @@ +.drone.yml +*.tpl.md