Merge branch 'develop' into renovate/lucide-monorepo

gatesn · web-flow · commit dd748c4c477b · 2026-05-04T12:06:14.000-04:00
diff --git a/.github/workflows/approvals.yml b/.github/workflows/approvals.yml
@@ -23,21 +23,20 @@ jobs:
               pull_number: pr.number,
             });
 
-            // Count unique human approvals (latest review per user)
+            // Determine if PR author is a bot/GitHub Actions
+            const authorType = pr.user.type;        // 'Bot' vs 'User'
+            const authorLogin = pr.user.login;       // e.g. 'github-actions[bot]'
+            const isBot = authorType === 'Bot' || authorLogin.endsWith('[bot]');
+            const oneApprovalBotAuthors = new Set(['renovate[bot]']);
+
+            // Count unique approvals, including bot approvals.
             const latestByUser = {};
             for (const review of reviews.data) {
-              if (review.user.type === 'Bot') continue;
               latestByUser[review.user.login] = review.state;
             }
             const approvalCount = Object.values(latestByUser)
               .filter(state => state === 'APPROVED').length;
 
-            // Determine if PR author is a bot/GitHub Actions
-            const authorType = pr.user.type;        // 'Bot' vs 'User'
-            const authorLogin = pr.user.login;       // e.g. 'github-actions[bot]'
-            const isBot = authorType === 'Bot' || authorLogin.endsWith('[bot]');
-            const oneApprovalBotAuthors = new Set(['renovate[bot]']);
-
             const required = isBot && !oneApprovalBotAuthors.has(authorLogin) ? 2 : 1;
 
             console.log(`PR author: ${authorLogin} (${authorType}), isBot: ${isBot}`);
@@ -46,7 +45,7 @@ jobs:
 
             if (isBot && (approvalCount < required))  {
               core.setFailed(
-                `This PR needs ${required} human approval(s) but has ${approvalCount}. ` +
+                `This PR needs ${required} approval(s) but has ${approvalCount}. ` +
                 `(Author is ${isBot ? 'a bot' : 'human'})`
               );
             }
diff --git a/.github/workflows/claude-review.yml b/.github/workflows/claude-review.yml
@@ -19,12 +19,6 @@ name: Claude Code (Review)
 # - PR conversation comments on PRs already opened by the Claude App are handled by
 #   claude-write.yml so maintainers can ask Claude to make follow-up changes there.
 
-concurrency:
-  # `issue_comment` events on PRs expose the PR number via `github.event.issue.number`,
-  # so this falls back there when `github.event.pull_request.number` is unset.
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.issue.number || github.run_id }}
-  cancel-in-progress: true
-
 on:
   issue_comment:
     types: [created]
@@ -226,6 +220,11 @@ jobs:
     if: needs.gate.outputs.should_run == 'true'
     runs-on: ubuntu-latest
     timeout-minutes: 45
+    concurrency:
+      # `issue_comment` events on PRs expose the PR number via `github.event.issue.number`,
+      # so this falls back there when `github.event.pull_request.number` is unset.
+      group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.issue.number || github.run_id }}
+      cancel-in-progress: true
     permissions:
       contents: read
       issues: write
diff --git a/.github/workflows/claude-write.yml b/.github/workflows/claude-write.yml
@@ -27,10 +27,6 @@ name: Claude Code (Write)
 #   than the numeric App ID in the PR payload, so the gate checks `CLAUDE_APP_LOGIN`
 #   instead of comparing directly to `APP_ID`.
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}
-  cancel-in-progress: true
-
 on:
   issues:
     types: [opened, assigned]
@@ -152,6 +148,9 @@ jobs:
     if: needs.gate.outputs.should_run == 'true'
     runs-on: ubuntu-latest
     timeout-minutes: 60
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}
+      cancel-in-progress: true
 
     environment:
       # The App private key lives only in this environment so only this single job
