improved workflows

Author: FaserF

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,2 @@
 blank_issues_enabled: false
+

.github/pull_request_template.md

@@ -25,3 +25,4 @@
 - [ ] My code follows the project's style guidelines
 - [ ] I have performed a self-review of my code
 - [ ] I have updated the README.md if applicable
+

.github/workflows/fanex-id-bot.yml

@@ -23,3 +23,4 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           enabled: true
+

.github/workflows/housekeeping.yml

@@ -69,3 +69,4 @@ jobs:
               }
             }
             console.log(`Deleted ${deletedCount} orphaned caches`);
+

.github/workflows/pr-assistant.yml

@@ -86,3 +86,4 @@ jobs:
               repo: context.repo.repo,
               body: `🎉 **Thank you @${author}!**\n\nYour contribution to the **faneX-ID GitHub Bot** repository is valuable! 🚀`
             });
+

.github/workflows/pr-autofix.yml

@@ -39,3 +39,4 @@ jobs:
             git commit -m "style: auto-fix linting issues [skip ci]"
             git push origin HEAD:${{ github.head_ref }}
           fi
+

.github/workflows/pr-thanks.yml

@@ -25,3 +25,4 @@ jobs:
               repo: context.repo.repo,
               body: `🎉 **Thank you @${author}!**\n\nYour contribution to the **faneX-ID GitHub Bot** repository is valuable! 🚀`
             })
+

.github/workflows/pr-validation.yml

@@ -73,3 +73,4 @@ jobs:
                 body: "❌ **PR Validation Failed**\n\nPlease check the logs and fix the issues."
               });
             }
+

bot.py

@@ -315,7 +315,12 @@ def post_pr_summary(self, pr_number: int, force_update: bool = False) -> None:
         status = self.workflow_manager.get_workflow_status(pr.head.sha, pr.head.ref)
 
         # Check if all checks truly passed (including branch workflows)
-        all_passed, details = self.workflow_manager.are_all_checks_passed(pr.head.sha, pr.head.ref)
+        # Exclude bot workflow from the check if it failed (bot can fail but other checks should pass)
+        all_passed, details = self.workflow_manager.are_all_checks_passed(
+            pr.head.sha,
+            pr.head.ref,
+            exclude_workflows=["faneX-ID Bot"]  # Exclude bot workflow from merge check
+        )
 
         # Check if we already posted a summary
         comments = pr.get_issue_comments()
@@ -341,6 +346,19 @@ def post_pr_summary(self, pr_number: int, force_update: bool = False) -> None:
             pr.create_issue_comment(summary)
             print(f"✅ Created new PR summary comment on PR #{pr_number}")
 
+        # Auto-merge if all checks passed (excluding bot workflow)
+        if all_passed and pr.mergeable and not pr.merged:
+            try:
+                # Check if PR is in a mergeable state
+                if pr.state == "open":
+                    # Attempt to merge
+                    pr.merge(merge_method="squash", commit_message=f"Auto-merge: {pr.title}")
+                    print(f"✅ Auto-merged PR #{pr_number}")
+                    pr.create_issue_comment("🤖 **Auto-merged by faneX-ID Bot** - All checks passed successfully!")
+            except Exception as e:
+                print(f"⚠️ Could not auto-merge PR #{pr_number}: {e}")
+                # Don't fail the workflow if merge fails (might be due to branch protection, etc.)
+
 
 def main():
     """Main entry point for the bot."""

workflow_manager.py

@@ -116,7 +116,7 @@ def get_workflow_status(self, sha: str, branch: str = None) -> Dict:
             "workflows": list(workflows.values()),
         }
 
-    def are_all_checks_passed(self, sha: str, branch: str = None) -> Tuple[bool, Dict]:
+    def are_all_checks_passed(self, sha: str, branch: str = None, exclude_workflows: List[str] = None) -> Tuple[bool, Dict]:
         """
         Check if all checks and workflows have passed for a commit and branch.
 
@@ -128,10 +128,13 @@ def are_all_checks_passed(self, sha: str, branch: str = None) -> Tuple[bool, Dic
         Args:
             sha: Commit SHA
             branch: Optional branch name to also check workflows for the branch
+            exclude_workflows: List of workflow names to exclude from the check
 
         Returns:
             Tuple of (all_passed: bool, details: Dict)
         """
+        if exclude_workflows is None:
+            exclude_workflows = []
         import requests
 
         # Get checks for the SHA
@@ -170,24 +173,32 @@ def are_all_checks_passed(self, sha: str, branch: str = None) -> Tuple[bool, Dic
             combined_status == "success"
         )
 
-        # Check if all workflows passed
+        # Check if all workflows passed (excluding specified workflows)
         workflows = workflow_status.get("workflows", [])
+        # Filter out excluded workflows
+        relevant_workflows = [
+            w for w in workflows
+            if w.get("name") not in exclude_workflows
+        ]
+
         all_workflows_passed = (
-            len(workflows) > 0 and
+            len(relevant_workflows) > 0 and
             all(w.get("status") == "completed" and w.get("conclusion") == "success"
-                for w in workflows)
+                for w in relevant_workflows)
         )
 
-        # Check for running workflows
+        # Check for running workflows (excluding excluded ones)
         running_workflows = [
             w for w in workflows
-            if w.get("status") in ["in_progress", "queued", "waiting"]
+            if w.get("name") not in exclude_workflows
+            and w.get("status") in ["in_progress", "queued", "waiting"]
         ]
 
-        # Check for failed workflows
+        # Check for failed workflows (excluding excluded ones)
         failed_workflows = [
             w for w in workflows
-            if w.get("status") == "completed" and w.get("conclusion") == "failure"
+            if w.get("name") not in exclude_workflows
+            and w.get("status") == "completed" and w.get("conclusion") == "failure"
         ]
 
         # Check for pending checks
@@ -221,8 +232,9 @@ def are_all_checks_passed(self, sha: str, branch: str = None) -> Tuple[bool, Dic
             "pending_checks": pending_checks,
             "failed_checks": failed_checks,
             "total_checks": len(check_runs),
-            "total_workflows": len(workflows),
+            "total_workflows": len(relevant_workflows),
             "combined_status": combined_status,
+            "excluded_workflows": exclude_workflows,
         }
 
         return (truly_all_passed, details)