ci(scripts): enhance publish script with improved changelog handling and tag management

- Extract changes from `CHANGELOG.md` for GitHub releases, falling back to auto-generated notes if no changes are found.
- Add functionality to move tags to the current HEAD after amending commits.
- Ensure tags are pushed immediately after commits.

Author: b1ff

scripts/publish.sh

@@ -13,12 +13,45 @@ create_github_release() {
   echo "Creating GitHub release..."
   LATEST_TAG=$(git describe --tags --abbrev=0)
   if [ ! -z "$LATEST_TAG" ]; then
-    # Use CHANGELOG.md if it exists, otherwise use auto-generated notes
-    if [ -f "CHANGELOG.md" ]; then
-      gh release create "$LATEST_TAG" -F CHANGELOG.md --latest || echo "Release may already exist or creation failed"
+    # Extract CHANGELOG.md changes from the release commit
+    # Get the added lines from CHANGELOG.md, excluding the header lines and empty lines
+    TEMP_NOTES="/tmp/release_notes_$$.md"
+
+    # Extract the diff and format it properly
+    git diff HEAD^ HEAD -- CHANGELOG.md 2>/dev/null | \
+      grep '^+' | \
+      grep -v '^+++' | \
+      sed 's/^+//' | \
+      grep -v '^# Change Log' | \
+      grep -v '^All notable changes' | \
+      grep -v '^See \[Conventional Commits\]' | \
+      grep -v '^$' | \
+      head -n 20 > "$TEMP_NOTES"
+
+    if [ -s "$TEMP_NOTES" ]; then
+      echo "Creating release with changes from CHANGELOG.md"
+      gh release create "$LATEST_TAG" -F "$TEMP_NOTES" --latest || echo "Release may already exist or creation failed"
     else
+      echo "No CHANGELOG.md changes found, using auto-generated notes"
       gh release create "$LATEST_TAG" --generate-notes --latest || echo "Release may already exist or creation failed"
     fi
+
+    rm -f "$TEMP_NOTES"
+  fi
+}
+
+# Function to move tags to current HEAD
+move_tags_to_head() {
+  echo "Moving tags to current HEAD..."
+  # Get all tags pointing to the previous commit
+  PREV_COMMIT=$(git rev-parse HEAD^)
+  TAGS_TO_MOVE=$(git tag --points-at "$PREV_COMMIT" 2>/dev/null || true)
+
+  if [ ! -z "$TAGS_TO_MOVE" ]; then
+    for tag in $TAGS_TO_MOVE; do
+      echo "Moving tag $tag to HEAD"
+      git tag -f "$tag" HEAD
+    done
   fi
 }
 
@@ -46,22 +79,34 @@ if git diff-tree --no-commit-id --name-only -r HEAD | grep -q "package-lock.json
     git add -A
     # Amend the last commit instead of creating a new one
     git commit --amend --no-edit
+
+    # Move tags from the old commit to the amended commit
+    move_tags_to_head
+
     echo "Pushing amended commit..."
     git push origin HEAD:master
-    echo "Push completed."
+    echo "Commit pushed."
+
+    # Push tags immediately after commit
+    push_tags
   else
     echo "No changes to commit after reverting package-lock.json files"
     # Still push the commit even if no changes were made
     git push origin master
-    echo "Push completed."
+    echo "Commit pushed."
+
+    # Push tags immediately after commit
+    push_tags
   fi
 else
   echo "No package-lock.json changes detected"
   # Push the commit created by lerna
   git push origin master
-  echo "Push completed."
+  echo "Commit pushed."
+
+  # Push tags immediately after commit
+  push_tags
 fi
 
-# Always push tags and create release after handling commits
-push_tags
+# Don't push tags again - already done above
 create_github_release