From cb1304317396aa606babe81752106b30b3445418 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 9 May 2021 22:42:31 +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 c1fe4c2..62cb966 100644 --- a/.drone.yml +++ b/.drone.yml @@ -64,15 +64,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: @@ -197,6 +204,6 @@ depends_on: --- kind: signature -hmac: e03145d27db00972b4bb48d3893c13c5c6998ed72a2243303dbadf11fc442d61 +hmac: c8e827316b75615b657c139fe9d40cfa5cc00f2b38b5127b3040fac499e9d3a6 ... diff --git a/.prettierignore b/.prettierignore index eef18b7..97e0b3e 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1,2 @@ .drone.yml +*.tpl.md