No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md
	index 9638d6d11..e57556e6c 100644
	--- a/.gitlab/merge_request_templates/Release.md
	+++ b/.gitlab/merge_request_templates/Release.md
	@@ -1,8 +1,8 @@
	### Release checklist
	* [ ] Bump version in `mix.exs`
	-* [ ] Compile a changelog
	+* [ ] Compile a changelog with the `tools/collect-changelog` script
	* [ ] Create an MR with an announcement to pleroma.social
	#### post-merge
	* [ ] Tag the release on the merge commit
	* [ ] Make the tag into a Gitlab Release™
	* [ ] Merge `stable` into `develop` (in case the fixes are already in develop, use `git merge -s ours --no-commit` and manually merge the changelogs)
	diff --git a/tools/collect-changelog b/tools/collect-changelog
	new file mode 100755
	index 000000000..1e12d5640
	--- /dev/null
	+++ b/tools/collect-changelog
	@@ -0,0 +1,27 @@
	+#!/bin/sh
	+
	+collectType() {
	+ local suffix="$1"
	+ local header="$2"
	+ local printed=0
	+ for file in changelog.d/*."$suffix"; do
	+ if [ '!' -f "$file" ]; then
	+ continue
	+ fi
	+ if [ "$printed" = 0 ]; then
	+ echo
	+ echo "### $header"
	+ printed=1
	+ fi
	+ # Normalize any trailing newlines/spaces, etc.
	+ echo "- $(cat "$file")"
	+ done
	+}
	+
	+collectType security Security
	+collectType change Changed
	+collectType add Added
	+collectType fix Fixed
	+collectType remove Removed
	+
	+rm changelog.d/*