Merge pull request #28 from lucaromagnoli/fix/pipeline-merge

fix: improve release notes generation and changelog handling

Author: lucaromagnoli

.github/workflows/code-quality.yml

@@ -1,8 +1,6 @@
 name: Code Quality
 
 on:
-  push:
-    branches: [ main, develop ]
   pull_request:
     branches: [ main, develop ]
 

.github/workflows/release.yml

@@ -228,18 +228,54 @@ jobs:
         run: |
           VERSION="${{ needs.validate-version.outputs.version }}"
 
+          echo "Looking for version $VERSION in changelog..."
+
+          # Debug: show what we're looking for
+          echo "Searching for pattern: ## [$VERSION]"
+
           # Extract release notes from CHANGELOG.md
           if grep -q "## \[$VERSION\]" CHANGELOG.md; then
+            echo "Found version $VERSION in changelog, extracting content..."
+
             # Get the content between the version header and the next version or end
+            # Use a more robust awk script that handles the format better
             RELEASE_NOTES=$(awk -v version="$VERSION" '
-              /^## \[' version '\]/ { in_version=1; next }
-              /^## \[/ && in_version { exit }
-              in_version { print }
-            ' CHANGELOG.md | sed '1d')  # Remove the first line (date)
+              BEGIN { in_version = 0; content = "" }
+              /^## \[' version '\]/ {
+                in_version = 1
+                next
+              }
+              /^## \[/ && in_version {
+                exit
+              }
+              in_version && /^###/ {
+                content = content "\n" $0
+              }
+              in_version && /^[[:space:]]*-/ {
+                content = content "\n" $0
+              }
+              in_version && /^[[:space:]]*$/ && content != "" {
+                content = content "\n"
+              }
+              END {
+                if (content != "") {
+                  print content
+                } else {
+                  print "No detailed changes found for this version."
+                }
+              }
+            ' CHANGELOG.md)
+
+            # Clean up the content
+            RELEASE_NOTES=$(echo "$RELEASE_NOTES" | sed '/^[[:space:]]*$/d' | head -20)
 
             # Add header
             RELEASE_NOTES="## 🚀 What's Changed\n\n$RELEASE_NOTES"
+
+            echo "Extracted release notes:"
+            echo "$RELEASE_NOTES"
           else
+            echo "Version $VERSION not found in changelog, using fallback..."
             # Fallback if changelog section not found
             RELEASE_NOTES="## 🚀 Release $VERSION\n\nThis release includes various improvements and bug fixes.\n\n**Full Changelog**: https://github.com/${{ github.repository }}/releases/tag/v$VERSION"
           fi

scripts/update-changelog.py

@@ -164,22 +164,52 @@ def update_changelog(self) -> None:
 
         # Update or create changelog file
         if Path(self.changelog_file).exists():
-            # Insert new content after header
+            # Read existing content
             with open(self.changelog_file, 'r') as f:
                 lines = f.readlines()
 
-            # Find where to insert (after header)
-            insert_pos = 0
-            for i, line in enumerate(lines):
-                if line.startswith('# Changelog'):
-                    insert_pos = i + 1
-                    break
-            
-            # Insert new content
-            new_lines = lines[:insert_pos] + ['\n'] + [new_content] + ['\n'] + lines[insert_pos:]
+            # Check if [Unreleased] section already exists
+            unreleased_exists = any('## [Unreleased]' in line for line in lines)
 
-            with open(self.changelog_file, 'w') as f:
-                f.writelines(new_lines)
+            if unreleased_exists:
+                # Find and replace the existing [Unreleased] section
+                new_lines = []
+                in_unreleased = False
+                skip_until_next_section = False
+                
+                for line in lines:
+                    if line.startswith('## [Unreleased]'):
+                        in_unreleased = True
+                        skip_until_next_section = True
+                        # Replace with new content
+                        new_lines.append(new_content)
+                        continue
+                    
+                    if in_unreleased and line.startswith('## ['):
+                        in_unreleased = False
+                        skip_until_next_section = False
+                        new_lines.append(line)
+                        continue
+                    
+                    if not skip_until_next_section:
+                        new_lines.append(line)
+                
+                # Write back the updated content
+                with open(self.changelog_file, 'w') as f:
+                    f.writelines(new_lines)
+            else:
+                # Insert new content after header
+                insert_pos = 0
+                for i, line in enumerate(lines):
+                    if line.startswith('# Changelog'):
+                        insert_pos = i + 1
+                        break
+                
+                # Insert new content
+                new_lines = lines[:insert_pos] + ['\n'] + [new_content] + ['\n'] + lines[insert_pos:]
+                
+                with open(self.changelog_file, 'w') as f:
+                    f.writelines(new_lines)
         else:
             # Create new changelog file
             header = """# Changelog