From 4053a49c30e217e0fc6d7a91f033253fab2751bc Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 9 May 2021 22:42:32 +0200 Subject: [PATCH] chore: improve generated changelog --- .chglog/CHANGELOG.tpl.md | 6 +++++- .drone.yml | 13 ++++++++++--- .prettierignore | 1 + 3 files changed, 16 insertions(+), 4 deletions(-) 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.yml b/.drone.yml index 4f85338..51162f1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -73,15 +73,22 @@ steps: depends_on: - dryrun -- 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} depends_on: - tags +- name: changelog-format + image: thegeeklab/alpine-tools + commands: + - prettier CHANGELOG.md + - prettier -w CHANGELOG.md + depends_on: + - changelog-generate + - name: publish-dockerhub image: thegeeklab/drone-docker-buildx:20 settings: @@ -206,6 +213,6 @@ depends_on: --- kind: signature -hmac: 657e5b191f868dcd0863820de29c25538a4e1d0e3a1ff2db9ed182f9a27397a5 +hmac: 58aa7a015f01db64179bcdd9e68502a89850eb785283d5e5afccbf828c22d8e2 ... diff --git a/.prettierignore b/.prettierignore index eef18b7..97e0b3e 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1,2 @@ .drone.yml +*.tpl.md