From ae16862a1184ca6837f31ae5d968e40bba8aef5c Mon Sep 17 00:00:00 2001
From: Djeex <djeex@djeex.fr>
Date: Sun, 23 Aug 2026 22:57:01 +0200
Subject: [PATCH] Align release changelog with the commit-list template used on
 the sibling repos

---
 .gitea/workflows/ci.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 0c9d1c6..05efdeb 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -70,10 +70,11 @@ jobs:
         run: |
           BEFORE="${{ github.event.before }}"
           if [ -n "$BEFORE" ] && [ "$BEFORE" != "0000000000000000000000000000000000000000" ] && git cat-file -e "$BEFORE" 2>/dev/null; then
-            CHANGED=$(git diff --name-only "$BEFORE" "${{ github.sha }}")
+            BASE_REF="$BEFORE"
           else
-            CHANGED=$(git diff --name-only HEAD~1 HEAD)
+            BASE_REF="HEAD~1"
           fi
+          CHANGED=$(git diff --name-only "$BASE_REF" "${{ github.sha }}")
           echo "Changed files:"
           echo "$CHANGED"
 
@@ -146,7 +147,7 @@ jobs:
             fi
           fi
 
-          CHANGED_LIST=$(echo "$CHANGED" | sed 's/^/- /')
+          COMMIT_LIST=$(git log --no-merges --format='- %s' "$BASE_REF".."${{ github.sha }}")
 
           REPO_URL="https://git.djeex.fr/Djeex/adguard-cidre"
           SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
@@ -157,15 +158,17 @@ jobs:
 
           BODY=$(cat <<EOF
           ## Changelog
+          ---
 
           ### ${CATEGORY}
+          ---
           ${CHANGE_TITLE}
 
           **Source:** ${SOURCE_LINE}
           **Image:** \`${IMAGE}:${VERSION}\`
 
-          **Changed files:**
-          ${CHANGED_LIST}
+          **Commits:**
+          ${COMMIT_LIST}
           EOF
           )