From 6a13c2d180177692b976b179f0bd86f8f93e2803 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Wed, 25 Oct 2023 20:44:47 -0400
Subject: Add collect-changelog script

---
 tools/collect-changelog | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100755 tools/collect-changelog

(limited to 'tools')

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/*
-- 
cgit v1.2.3


From e1bc95ae6eb7a5474433a25268617277b3c9e85b Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sat, 3 Jun 2023 14:03:51 -0400
Subject: Support a type called "change"

---
 tools/check-changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/check-changelog b/tools/check-changelog
index 60692033f..64e59ae7f 100644
--- a/tools/check-changelog
+++ b/tools/check-changelog
@@ -6,7 +6,7 @@ git remote add upstream https://git.pleroma.social/pleroma/pleroma.git
 git fetch upstream ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}:refs/remotes/upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
 
 git diff --raw --no-renames upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \
-    grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\)$'
+    grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security|change\)$'
 ret=$?
 
 if [ $ret -eq 0 ]; then
-- 
cgit v1.2.3


From addc5408ff570db955e06de1fbc4f7963538be04 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 8 Nov 2023 12:27:46 -0500
Subject: Fix changelogd grep syntax error

---
 tools/check-changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/check-changelog b/tools/check-changelog
index 64e59ae7f..d053ed577 100644
--- a/tools/check-changelog
+++ b/tools/check-changelog
@@ -6,7 +6,7 @@ git remote add upstream https://git.pleroma.social/pleroma/pleroma.git
 git fetch upstream ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}:refs/remotes/upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
 
 git diff --raw --no-renames upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \
-    grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security|change\)$'
+    grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\|change\)$'
 ret=$?
 
 if [ $ret -eq 0 ]; then
-- 
cgit v1.2.3


From 4648997a1017da68dcf5235e527e861f2c85cf91 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Thu, 15 Feb 2024 10:06:37 -0500
Subject: Support a new changelog entry type: deps

---
 tools/check-changelog   | 2 +-
 tools/collect-changelog | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/check-changelog b/tools/check-changelog
index d053ed577..28ef8454e 100644
--- a/tools/check-changelog
+++ b/tools/check-changelog
@@ -6,7 +6,7 @@ git remote add upstream https://git.pleroma.social/pleroma/pleroma.git
 git fetch upstream ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}:refs/remotes/upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
 
 git diff --raw --no-renames upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \
-    grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\|change\)$'
+    grep ' A\t' | grep '\.\(add\|change\|deps\|fix\|remove\|security\)$'
 ret=$?
 
 if [ $ret -eq 0 ]; then
diff --git a/tools/collect-changelog b/tools/collect-changelog
index 1e12d5640..d0e4905d4 100755
--- a/tools/collect-changelog
+++ b/tools/collect-changelog
@@ -23,5 +23,6 @@ collectType change Changed
 collectType add Added
 collectType fix Fixed
 collectType remove Removed
+collectType deps Dependencies
 
 rm changelog.d/*
-- 
cgit v1.2.3


From c9cd449bba73375c25f9ef4c31caf80d0506ff63 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Fri, 16 Feb 2024 12:51:39 -0500
Subject: Revert "Support a new changelog entry type: deps"

This reverts commit 4648997a1017da68dcf5235e527e861f2c85cf91.
---
 tools/check-changelog   | 2 +-
 tools/collect-changelog | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/check-changelog b/tools/check-changelog
index 28ef8454e..d053ed577 100644
--- a/tools/check-changelog
+++ b/tools/check-changelog
@@ -6,7 +6,7 @@ git remote add upstream https://git.pleroma.social/pleroma/pleroma.git
 git fetch upstream ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}:refs/remotes/upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
 
 git diff --raw --no-renames upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \
-    grep ' A\t' | grep '\.\(add\|change\|deps\|fix\|remove\|security\)$'
+    grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\|change\)$'
 ret=$?
 
 if [ $ret -eq 0 ]; then
diff --git a/tools/collect-changelog b/tools/collect-changelog
index d0e4905d4..1e12d5640 100755
--- a/tools/collect-changelog
+++ b/tools/collect-changelog
@@ -23,6 +23,5 @@ collectType change Changed
 collectType add Added
 collectType fix Fixed
 collectType remove Removed
-collectType deps Dependencies
 
 rm changelog.d/*
-- 
cgit v1.2.3