From c9dd143916d758991f3ba30723a32c18b6f98bb5 Mon Sep 17 00:00:00 2001
From: Max Richter <max@max-richter.dev>
Date: Sat, 7 Feb 2026 16:29:59 +0100
Subject: [PATCH] fix(ci): correctly add release notes from tag to changelog

---
 .gitea/scripts/create-release.sh | 42 +++++++++++++-------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/.gitea/scripts/create-release.sh b/.gitea/scripts/create-release.sh
index 3424ccf..e7f365e 100755
--- a/.gitea/scripts/create-release.sh
+++ b/.gitea/scripts/create-release.sh
@@ -5,16 +5,21 @@ TAG="$GITHUB_REF_NAME"
 VERSION=$(echo "$TAG" | sed 's/^v//')
 DATE=$(date +%Y-%m-%d)
 
-echo "🚀 Creating release for $TAG (safe mode)"
+echo "🚀 Creating release for $TAG"
 
 # -------------------------------------------------------------------
 # 1. Extract release notes from annotated tag
 # -------------------------------------------------------------------
 
+# Ensure the local git knows this is an annotated tag with metadata
+git fetch origin "refs/tags/$TAG:refs/tags/$TAG" --force
+
+# %(contents) gets the whole message.
+# If you want ONLY what you typed after the first line, use %(contents:body)
 NOTES=$(git tag -l "$TAG" --format='%(contents)')
 
-if [ -z "$NOTES" ]; then
-  echo "❌ Tag message is empty"
+if [ -z "$(echo "$NOTES" | tr -d '[:space:]')" ]; then
+  echo "❌ Tag message is empty or tag is not annotated"
   exit 1
 fi
 
@@ -23,10 +28,8 @@ git checkout main
 # -------------------------------------------------------------------
 # 2. Update all package.json versions
 # -------------------------------------------------------------------
-
 echo "🔧 Updating package.json versions to $VERSION"
-
-find . -name package.json ! -path "*/node_modules/*" | while read file; do
+find . -name package.json ! -path "*/node_modules/*" | while read -r file; do
   tmp_file="$file.tmp"
   jq --arg v "$VERSION" '.version = $v' "$file" >"$tmp_file"
   mv "$tmp_file" "$file"
@@ -35,20 +38,18 @@ done
 # -------------------------------------------------------------------
 # 3. Generate commit list since last release
 # -------------------------------------------------------------------
-
-# Get the previous tag (fallback to empty if none)
 LAST_TAG=$(git tag --sort=-creatordate | grep -v "^$TAG$" | head -n 1 || echo "")
 
 if [ -n "$LAST_TAG" ]; then
-  COMMITS=$(git log "$LAST_TAG"..HEAD --pretty=format:'[%h](https://git.max-richter.dev/max/nodarium/commit/%H) %s')
+  # Filter out previous 'chore(release)' commits so the list stays clean
+  COMMITS=$(git log "$LAST_TAG"..HEAD --pretty=format:'* [%h](https://git.max-richter.dev/max/nodarium/commit/%H) %s' | grep -v "chore(release)")
 else
-  COMMITS=$(git log HEAD --pretty=format:'[%h](https://git.max-richter.dev/max/nodarium/commit/%H) %s')
+  COMMITS=$(git log HEAD --pretty=format:'* [%h](https://git.max-richter.dev/max/nodarium/commit/%H) %s' | grep -v "chore(release)")
 fi
 
 # -------------------------------------------------------------------
 # 4. Update CHANGELOG.md (prepend)
 # -------------------------------------------------------------------
-
 tmp_changelog="CHANGELOG.tmp"
 {
   echo "## $TAG ($DATE)"
@@ -56,7 +57,7 @@ tmp_changelog="CHANGELOG.tmp"
   echo "$NOTES"
   echo ""
   if [ -n "$COMMITS" ]; then
-    echo "All Commits:"
+    echo "### All Commits in this version:"
     echo "$COMMITS"
     echo ""
   fi
@@ -74,26 +75,17 @@ pnpm exec dprint fmt CHANGELOG.md
 # -------------------------------------------------------------------
 # 5. Create release commit
 # -------------------------------------------------------------------
-
 git config user.name "release-bot"
 git config user.email "release-bot@ci"
 
 git add CHANGELOG.md $(find . -name package.json ! -path "*/node_modules/*")
 
-# Skip commit if nothing changed
 if git diff --cached --quiet; then
   echo "No changes to commit for release $TAG"
-  exit 0
+else
+  git commit -m "chore(release): $TAG"
+  git push origin main
 fi
 
-git commit -m "chore(release): $TAG"
-
-# -------------------------------------------------------------------
-# 6. Push changes
-# -------------------------------------------------------------------
-
-git push origin main
-
 cp CHANGELOG.md app/static/CHANGELOG.md
-
-echo "✅ Release commit for $TAG created successfully (tag untouched)"
+echo "✅ Release process for $TAG complete"