From 6aa9b023f04e3151c85591ac02796c4536fa7958 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Sun, 28 Aug 2022 11:13:36 -0400
Subject: Use dedicated script

---
 tools/check-changelog | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 tools/check-changelog

(limited to 'tools')

diff --git a/tools/check-changelog b/tools/check-changelog
new file mode 100644
index 000000000..970f3066f
--- /dev/null
+++ b/tools/check-changelog
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+echo $CI_MERGE_REQUEST_IID
+ls changelog.d
+count=0
+for i in add remove fix security skip; do
+    [ -f changelog.d/"$CI_MERGE_REQUEST_IID"."$i" ]
+    retcode=$?
+    if [ $retcode -eq 0 ]; then
+        echo "found $CI_MERGE_REQUEST_IID.$i"
+    else
+        echo "no $CI_MERGE_REQUEST_IID.$i"
+    fi
+    count=$(( $count + 1 - $retcode ))
+done
+if [ $count -eq 1 ]; then
+    echo "ok"
+    exit 0
+else
+    echo "must have a changelog entry or explicitly skip it"
+    exit 1
+fi
-- 
cgit v1.2.3


From 89a40b867df13205e710c136e5c6cd9be1b76733 Mon Sep 17 00:00:00 2001
From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Tue, 4 Apr 2023 16:20:46 +0000
Subject: Allow more than 1 changelog entry

---
 tools/check-changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/check-changelog b/tools/check-changelog
index 970f3066f..c3e9e07c7 100644
--- a/tools/check-changelog
+++ b/tools/check-changelog
@@ -8,12 +8,12 @@ for i in add remove fix security skip; do
     retcode=$?
     if [ $retcode -eq 0 ]; then
         echo "found $CI_MERGE_REQUEST_IID.$i"
+        count=$(( count++ ))
     else
         echo "no $CI_MERGE_REQUEST_IID.$i"
     fi
-    count=$(( $count + 1 - $retcode ))
 done
-if [ $count -eq 1 ]; then
+if [ $count -gt 0 ]; then
     echo "ok"
     exit 0
 else
-- 
cgit v1.2.3


From 686c3e03bd6c13e732e95d2f81cc4bcd0acf015a Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Tue, 4 Apr 2023 12:24:45 -0400
Subject: Fix counting

---
 tools/check-changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/check-changelog b/tools/check-changelog
index c3e9e07c7..b94b52755 100644
--- a/tools/check-changelog
+++ b/tools/check-changelog
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-echo $CI_MERGE_REQUEST_IID
-ls changelog.d
+echo "looking for change log of $CI_MERGE_REQUEST_IID"
+
 count=0
 for i in add remove fix security skip; do
     [ -f changelog.d/"$CI_MERGE_REQUEST_IID"."$i" ]
     retcode=$?
     if [ $retcode -eq 0 ]; then
         echo "found $CI_MERGE_REQUEST_IID.$i"
-        count=$(( count++ ))
+        count=$(( count + 1 ))
     else
         echo "no $CI_MERGE_REQUEST_IID.$i"
     fi
-- 
cgit v1.2.3