Fix the hotfix yaml not being able to handle the

Author: benflexcompute

.github/workflows/create-hotfix-pr.yml

@@ -1,3 +1,4 @@
+```yaml
 name: Create Hotfix PR
 
 on:
@@ -52,34 +53,35 @@ jobs:
           TARGET_BRANCHES=("main") # Always target main for hotfix
 
           # Get all remote 'release-candidate' branches with version pattern as YY.I or YY.II
-          ALL_RELEASE_CANDIDATE_BRANCHES=$(git branch -r | grep 'origin/release-candidate/' | sed 's/.*origin\///' | grep -E '^release-candidate/[0-9]{2}\.[0-9]{1,2}$' | sort -V)
+          ALL_RELEASE_CANDIDATE_BRANCHES=$(git branch -r \
+            | grep 'origin/release-candidate/' \
+            | sed 's/.*origin\///' \
+            | grep -E '^release-candidate/[0-9]{2}\.[0-9]{1,2}$' \
+            | sort -V)
           echo "Found release-candidate branches: $ALL_RELEASE_CANDIDATE_BRANCHES"
 
           # Determine the version of the current PR's base branch
-          # Example: release-candidate/25.5 -> 25.05 (for proper numerical comparison)
-          PR_BASE_VERSION=$(echo "$PR_BASE_BRANCH" | sed -n 's/release-candidate\/\([0-9]\{2\}\)\.\([0-9]\{1,2\}\)/\1.\2/p')
-          
+          PR_BASE_VERSION=$(echo "$PR_BASE_BRANCH" \
+            | sed -n 's/release-candidate\/\([0-9]\{2\}\)\.\([0-9]\{1,2\}\)/\1.\2/p')
+
           # Handle cases like 25.5 vs 25.05 for comparison
           if [[ "$PR_BASE_VERSION" =~ ^[0-9]{2}\.[0-9]$ ]]; then
-            PR_BASE_VERSION=$(echo "$PR_BASE_VERSION" | awk '{printf "%s%02d", substr($1,1,3), substr($1,4)}')
+            PR_BASE_VERSION=$(echo "$PR_BASE_VERSION" \
+              | awk '{printf "%s%02d", substr($1,1,3), substr($1,4)}')
           fi
+          echo "Base branch version: $PR_BASE_VERSION"
 
           if [[ -n "$PR_BASE_VERSION" ]]; then
-            echo "Base branch version: $PR_BASE_VERSION"
             for branch in $ALL_RELEASE_CANDIDATE_BRANCHES; do
-              # Extract version for comparison
-              BRANCH_VERSION=$(echo "$branch" | sed -n 's/release-candidate\/\([0-9]\{2\}\)\.\([0-9]\{1,2\}\)/\1.\2/p')
-              
-              if [[ -n "$BRANCH_VERSION" ]]; then
-                if [[ "$BRANCH_VERSION" =~ ^[0-9]{2}\.[0-9]$ ]]; then
-                  BRANCH_VERSION=$(echo "$BRANCH_VERSION" | awk '{printf "%s%02d", substr($1,1,3), substr($1,4)}')
-                fi
-
-                # Compare versions
-                if (( $(echo "$BRANCH_VERSION > $PR_BASE_VERSION" | bc -l) )); then
-                  TARGET_BRANCHES+=("$branch")
-                  echo "Adding $branch (version $BRANCH_VERSION) as it's higher than $PR_BASE_BRANCH (version $PR_BASE_VERSION)"
-                fi
+              BRANCH_VERSION=$(echo "$branch" \
+                | sed -n 's/release-candidate\/\([0-9]\{2\}\)\.\([0-9]\{1,2\}\)/\1.\2/p')
+              if [[ "$BRANCH_VERSION" =~ ^[0-9]{2}\.[0-9]$ ]]; then
+                BRANCH_VERSION=$(echo "$BRANCH_VERSION" \
+                  | awk '{printf "%s%02d", substr($1,1,3), substr($1,4)}')
+              fi
+              if (( $(echo "$BRANCH_VERSION > $PR_BASE_VERSION" | bc -l) )); then
+                TARGET_BRANCHES+=("$branch")
+                echo "Adding $branch (version $BRANCH_VERSION) as it's higher than $PR_BASE_BRANCH (version $PR_BASE_VERSION)"
               fi
             done
           fi
@@ -90,8 +92,6 @@ jobs:
           echo "HOTFIX_BRANCHES<<$DELIMITER" >> $GITHUB_OUTPUT
           echo "$HOTFIX_BRANCHES_JSON" >> $GITHUB_OUTPUT
           echo "$DELIMITER" >> $GITHUB_OUTPUT
-          echo "Calculated hotfix target branches: ${TARGET_BRANCHES[@]}"
-
 
       - name: Define Branch Names
         id: define_branches
@@ -108,14 +108,19 @@ jobs:
           done
           
           # Remove trailing space and store the list
-          branch_list="${branch_list% }"
-          echo "branch_pairs=${branch_list}" >> $GITHUB_OUTPUT
+          echo "branch_pairs=${branch_list% }" >> $GITHUB_OUTPUT
 
       - name: Create and Process Hotfix Branches
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          # Read branch pairs and process each one
+          # Prepare variables
+          PR_NUMBER=${{ github.event.pull_request.number }}
+          PR_URL=${{ github.event.pull_request.html_url }}
+          PR_AUTHOR=${{ github.event.pull_request.user.login }}
+          RAW_TITLE="${{ github.event.pull_request.title }}"
+
+          # Read branch pairs
           IFS=' ' read -r -a PAIRS <<< "${{ steps.define_branches.outputs.branch_pairs }}"
           
           for pair in "${PAIRS[@]}"; do
@@ -153,6 +158,7 @@ jobs:
               had_conflicts="false"
             fi
 
+            # Skip if no changes after cherry-pick
             CHANGED_FILES=$(git diff-tree --no-commit-id --name-only -r HEAD)
             if [ -z "$CHANGED_FILES" ]; then
                 echo "Cherry-pick resulted in no changes, skipping PR creation for $base_branch"
@@ -167,31 +173,35 @@ jobs:
             if git push origin "$new_branch"; then
               echo "Successfully pushed branch $new_branch"
               
-              # Create PR
-              PR_NUMBER="${{ github.event.pull_request.number }}"
-              PR_URL="${{ github.event.pull_request.html_url }}"
-              PR_AUTHOR="${{ github.event.pull_request.user.login }}"
+              # Build PR title & body using here-doc + placeholders (preserves backticks, emoji, etc.)
+              read -r -d '' TEMPLATE <<'EOF'
+[Hotfix __BASE_BRANCH__]: __RAW_TITLE__
 
-              # Adjust PR title based on the target branch
-              if [[ "$base_branch" == "main" ]]; then
-                PR_TITLE="[Hotfix Main]: ${{ github.event.pull_request.title }}"
-              else
-                base_branch_name=${base_branch#"release-candidate/"}
-                PR_TITLE="[Hotfix $base_branch_name]: ${{ github.event.pull_request.title }}"
-              fi
+Hotfix of PR #__PR_NUMBER__ (__PR_URL__) to the `__BASE_BRANCH__` branch.
 
-              PR_BODY="Hotfix of PR #${PR_NUMBER} (${PR_URL}) to the \`${base_branch}\` branch.
-              Hey @${PR_AUTHOR}, please review this hotfix PR created from your original PR."
+Hey @__PR_AUTHOR__, please review this hotfix PR.
+__CONFLICT_NOTICE__
+EOF
 
               # Add conflict warning if needed
               if [[ "$had_conflicts" == "true" ]]; then
-                PR_BODY="${PR_BODY}
-
-          ### ⚠️ **Note:** This PR had conflicts with the base branch and was resolved automatically. Please review the changes carefully."
+                CONFLICT_NOTICE=$'\n\n### ⚠️ **Note:** This PR had conflicts with the base branch and was resolved automatically. Please review the changes carefully.'
+              else
+                CONFLICT_NOTICE=""
               fi
-              
+
+              # Replace placeholders
+              PR_BODY="$TEMPLATE"
+              PR_BODY=${PR_BODY//__BASE_BRANCH__/$base_branch}
+              PR_BODY=${PR_BODY//__RAW_TITLE__/$RAW_TITLE}
+              PR_BODY=${PR_BODY//__PR_NUMBER__/$PR_NUMBER}
+              PR_BODY=${PR_BODY//__PR_URL__/$PR_URL}
+              PR_BODY=${PR_BODY//__PR_AUTHOR__/$PR_AUTHOR}
+              PR_BODY=${PR_BODY//__CONFLICT_NOTICE__/$CONFLICT_NOTICE}
+
+              # Create PR
               gh pr create \
-                --title "$PR_TITLE" \
+                --title "[Hotfix ${base_branch#release-candidate/}]: $RAW_TITLE" \
                 --body "$PR_BODY" \
                 --head "$new_branch" \
                 --base "$base_branch" \
@@ -201,4 +211,5 @@ jobs:
             else
               echo "Failed to push branch $new_branch"
             fi
-          done
+          done
+```