Fix change log generation (#1788)

Author: tarrencev

.github/workflows/changelog-generation.yml

@@ -107,13 +107,37 @@ jobs:
           if [ "${{ steps.check_changelog.outputs.exists }}" == "true" ]; then
             # Insert new entry after the header
             if [ -f "new-changelog-entry.md" ]; then
-              # Create temp file with header, new entry, and existing content
-              echo "# Changelog" > temp-changelog.md
-              echo "" >> temp-changelog.md
-              cat new-changelog-entry.md >> temp-changelog.md
-              echo "" >> temp-changelog.md
-              # Skip the header line and add existing content
-              tail -n +3 CHANGELOG.md >> temp-changelog.md
+              # Create a temporary file
+              touch temp-changelog.md
+              
+              # Process the file line by line
+              header_found=false
+              first_version_found=false
+              
+              while IFS= read -r line; do
+                if [[ "$line" =~ ^#[[:space:]]Changelog ]]; then
+                  # Found the header
+                  echo "$line" >> temp-changelog.md
+                  echo "" >> temp-changelog.md
+                  header_found=true
+                elif [[ "$header_found" == "true" && "$first_version_found" == "false" && "$line" =~ ^##[[:space:]]\[ ]]; then
+                  # Found the first version entry, insert new content before it
+                  cat new-changelog-entry.md >> temp-changelog.md
+                  echo "" >> temp-changelog.md
+                  echo "$line" >> temp-changelog.md
+                  first_version_found=true
+                else
+                  # Copy all other lines as-is
+                  echo "$line" >> temp-changelog.md
+                fi
+              done < CHANGELOG.md
+              
+              # If no version entries were found (empty changelog), append the new entry
+              if [[ "$first_version_found" == "false" && "$header_found" == "true" ]]; then
+                cat new-changelog-entry.md >> temp-changelog.md
+              fi
+              
+              # Replace the original file
               mv temp-changelog.md CHANGELOG.md
             fi
           else

.github/workflows/release.yml

@@ -54,8 +54,11 @@ jobs:
           if [ -f "CHANGELOG.md" ]; then
             # Extract the changelog section for this version
             # Find the start of this version's section and the start of the next version
+            echo "Looking for version: $VERSION"
             START_LINE=$(grep -n "## \[$VERSION\]" CHANGELOG.md | cut -d: -f1 | head -1)
+            
             if [ -n "$START_LINE" ]; then
+              echo "Found version at line: $START_LINE"
               # Find the next version section or end of file
               NEXT_LINE=$(tail -n +$((START_LINE + 1)) CHANGELOG.md | grep -n "^## \[" | head -1 | cut -d: -f1)
               if [ -n "$NEXT_LINE" ]; then
@@ -66,13 +69,17 @@ jobs:
                 tail -n +$START_LINE CHANGELOG.md > version-changelog.md
               fi
               
-              echo "RELEASE_NOTES<<EOF" >> $GITHUB_OUTPUT
+              # Use a unique delimiter that won't appear in changelog content
+              delimiter="END_OF_RELEASE_NOTES_$(date +%s)"
+              echo "RELEASE_NOTES<<$delimiter" >> $GITHUB_OUTPUT
               cat version-changelog.md >> $GITHUB_OUTPUT
-              echo "EOF" >> $GITHUB_OUTPUT
+              echo "$delimiter" >> $GITHUB_OUTPUT
             else
+              echo "Version $VERSION not found in CHANGELOG.md"
               echo "RELEASE_NOTES=## Release v$VERSION" >> $GITHUB_OUTPUT
             fi
           else
+            echo "CHANGELOG.md not found"
             echo "RELEASE_NOTES=## Release v$VERSION" >> $GITHUB_OUTPUT
           fi