From 7148b3d30658d6f61a53b0c513c4e230c41f3946 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 9 May 2021 23:46:51 +0200 Subject: [PATCH] chore: improve generated changelog (#25) --- .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 fc85e55..cdd7c65 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 102f129..a9d742e 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: @@ -389,6 +394,6 @@ depends_on: --- kind: signature -hmac: c19c718aab5069878ee662ea706da148d8e2f6a8d1ee5121e530d0988eafbf16 +hmac: 450e524b8b60cf174405bbe7c26be014671ae1a928157be53706232ace778e14 ... 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