Fix git author identity for PR commits and enforce atomic max_prs slot reservation

Author: aaronbell

.ci/autoupdater/catalog_audit.py

@@ -130,16 +130,23 @@ def process_single_family(item):
     if max_prs > 0:
         with pr_lock:
             if pr_counter[0] < max_prs:
+                pr_counter[0] += 1
                 should_create_pr = True
 
     try:
         res = pipeline.process_family(filepath, create_pr=should_create_pr, base_branch=base_branch)
 
-        if res.get("has_update") and res.get("pr_info") and res["pr_info"].get("created"):
-            with pr_lock:
-                pr_counter[0] += 1
+        # If we pre-allocated PR slot but family had no update or PR creation failed, release slot
+        if should_create_pr:
+            pr_created = res.get("has_update") and res.get("pr_info") and res["pr_info"].get("created")
+            if not pr_created:
+                with pr_lock:
+                    pr_counter[0] = max(0, pr_counter[0] - 1)
         return res
     except Exception as e:
+        if should_create_pr:
+            with pr_lock:
+                pr_counter[0] = max(0, pr_counter[0] - 1)
         return {
             "family_name": meta.name if meta else Path(filepath).parent.name,
             "has_update": False,
@@ -148,6 +155,7 @@ def process_single_family(item):
         }
 
 
+
 def run_full_catalog_audit(
     fonts_repo_path: str = ".",
     max_families: int = 2000,

.ci/autoupdater/pr_creator.py

@@ -68,7 +68,12 @@ def create_pull_request(
             # 5. Add and commit METADATA.pb
             subprocess.run(["git", "-c", "core.hooksPath=/dev/null", "add", str(meta_path)], check=True)
             commit_msg = f"Update {family_name} METADATA.pb to upstream {upstream_version or upstream_commit}"
-            subprocess.run(["git", "-c", "core.hooksPath=/dev/null", "commit", "-m", commit_msg], check=True)
+            subprocess.run([
+                "git", "-c", "core.hooksPath=/dev/null",
+                "-c", "user.name=github-actions[bot]",
+                "-c", "user.email=github-actions[bot]@users.noreply.github.com",
+                "commit", "-m", commit_msg
+            ], check=True)
 
             # 6. Push branch to origin
             subprocess.run(["git", "-c", "core.hooksPath=/dev/null", "push", "origin", branch_name, "--force"], check=True)
@@ -120,18 +125,19 @@ def create_pull_request(
             # Return to original branch
             subprocess.run(["git", "-c", "core.hooksPath=/dev/null", "checkout", original_branch], check=False)
 
-
             return {
                 "created": True,
                 "branch_name": branch_name,
                 "pr_url": pr_url or f"https://github.com/{self.repo_slug}/pulls",
                 "status": "PR_CREATED",
             }
         except Exception as e:
-            # Return to original branch on failure
-            subprocess.run(["git", "checkout", original_branch], check=False)
+            # Revert any uncommitted/unstaged changes and restore original branch
+            subprocess.run(["git", "-c", "core.hooksPath=/dev/null", "checkout", "--", "."], check=False)
+            subprocess.run(["git", "-c", "core.hooksPath=/dev/null", "checkout", original_branch], check=False)
             return {
                 "created": False,
                 "error": str(e),
                 "status": "PR_CREATION_FAILED",
             }
+

.github/workflows/weekly_autoupdate.yml

@@ -62,7 +62,13 @@ jobs:
           python -m pip install --upgrade pip
           pip install fontTools requests
 
+      - name: Configure Git Author Identity
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
       - name: Run Upstream Update Audit Sweep & Submit PR
+
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |