From ae16862a1184ca6837f31ae5d968e40bba8aef5c Mon Sep 17 00:00:00 2001 From: Djeex Date: Sun, 23 Aug 2026 22:57:01 +0200 Subject: [PATCH 1/2] 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 < Date: Sun, 23 Aug 2026 23:20:45 +0200 Subject: [PATCH 2/2] Link each commit in the release changelog to its own commit page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit COMMIT_LIST only rendered the bare subject line per commit, with no way to jump to that specific commit — only the triggering commit (Source:) had a link. Each line now reads "- [](/commit/) ", matching the same link style already used for Source. --- .gitea/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 05efdeb..84d8030 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -147,9 +147,9 @@ jobs: fi fi - COMMIT_LIST=$(git log --no-merges --format='- %s' "$BASE_REF".."${{ github.sha }}") - REPO_URL="https://git.djeex.fr/Djeex/adguard-cidre" + COMMIT_LIST=$(git log --no-merges --format="- [%h](${REPO_URL}/commit/%H) %s" "$BASE_REF".."${{ github.sha }}") + SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7) SOURCE_LINE="[${SHORT_SHA}](${REPO_URL}/commit/${{ github.sha }})" if [ -n "$PR_NUM" ]; then -- 2.54.0