Update auto-merge-to-main.yml

Author: 1minds3t

.github/workflows/auto-merge-to-main.yml

@@ -115,7 +115,6 @@ jobs:
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    # 👇 RESTORED MISSING STEP HERE
     - name: Check if already merged
       if: steps.check_all.outputs.should_merge == 'true'
       id: check_merged
@@ -133,13 +132,9 @@ jobs:
           echo "📝 Commit $SHORT_SHA not yet in main. Proceeding with merge."
           echo "already_merged=false" >> $GITHUB_OUTPUT
         fi
-
+    
     - name: Merge development into main
       if: steps.check_all.outputs.should_merge == 'true' && steps.check_merged.outputs.already_merged == 'false'
-      env:
-        # Combined env variables here to avoid duplicate key error
-        TRIGGER_WORKFLOW: ${{ github.event.workflow_run.name }}
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         COMMIT_SHA="${{ steps.check_all.outputs.commit_sha }}"
         SHORT_SHA="${{ steps.check_all.outputs.short_sha }}"
@@ -153,14 +148,16 @@ jobs:
         # Fetch latest development
         git fetch origin development
         
-        # Merge the commit
+        # Merge the commit (this brings all ancestor commits too!)
+        WORKFLOW_COUNT=$(jq '. | length' runs.json)
+        
         if git merge $COMMIT_SHA --no-ff -m "Auto-merge: development → main ($SHORT_SHA)
 
-        All CI checks passed for commit $SHORT_SHA.
+All CI checks passed for commit $SHORT_SHA.
 
-        ✅ Workflows completed: $(jq '. | length' runs.json)
-        📦 Merged by: GitHub Actions
-        🔗 Triggered by: $TRIGGER_WORKFLOW"; then
+✅ Workflows completed: $WORKFLOW_COUNT
+📦 Merged by: GitHub Actions
+🔗 Triggered by: ${{ github.event.workflow_run.name }}"; then
 
           echo "✅ Merge successful!"
 
@@ -178,32 +175,34 @@ jobs:
             --title "🚨 Auto-merge Failed: Conflict in $SHORT_SHA" \
             --body "## Merge Conflict Detected
 
-            Commit [$SHORT_SHA](https://github.com/${{ github.repository }}/commit/$COMMIT_SHA) passed all CI tests but has merge conflicts with \`main\`.
+Commit [$SHORT_SHA](https://github.com/${{ github.repository }}/commit/$COMMIT_SHA) passed all CI tests but has merge conflicts with main.
 
-            **Manual intervention required:**
+**Manual intervention required:**
 
-            \`\`\`bash
-            git checkout main
-            git pull origin main
-            git merge $COMMIT_SHA
-            # Resolve conflicts
-            git commit
-            git push origin main
-            \`\`\`
+\`\`\`bash
+git checkout main
+git pull origin main
+git merge $COMMIT_SHA
+# Resolve conflicts
+git commit
+git push origin main
+\`\`\`
 
-            **Or rebase development on main:**
+**Or rebase development on main:**
 
-            \`\`\`bash
-            git checkout development
-            git pull origin development
-            git rebase origin/main
-            # Resolve conflicts
-            git push --force-with-lease origin development
-            \`\`\`
+\`\`\`bash
+git checkout development
+git pull origin development
+git rebase origin/main
+# Resolve conflicts
+git push --force-with-lease origin development
+\`\`\`
 
-            Once resolved, this workflow will retry automatically." \
+Once resolved, this workflow will retry automatically." \
             --label "auto-merge-conflict" \
             --label "needs-manual-merge"
 
           exit 1
         fi
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}