From 65900535e567ebf0dfe8099a4d1da723d85fa1de Mon Sep 17 00:00:00 2001
From: Nikhil Kumar Rajak <ryzrr.official@gmail.com>
Date: Wed, 22 Jul 2026 16:48:08 +0000
Subject: [PATCH] fix(ci): run Lighthouse on deployment_status instead of
 pull_request

---
 .github/workflows/leave-comment.yml | 14 ++++++++
 .github/workflows/lighthouse.yml    | 50 +++++++++++++++++++++++------
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/leave-comment.yml b/.github/workflows/leave-comment.yml
index b40d8f79..df6f57f3 100644
--- a/.github/workflows/leave-comment.yml
+++ b/.github/workflows/leave-comment.yml
@@ -17,6 +17,8 @@ concurrency:
 jobs:
   leave-comment:
     name: Leave Comment
+    # only successful audits produce an artifact to post
+    if: github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -39,6 +41,18 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
+            const fs = require('fs');
+
+            // PR number written by the lighthouse job (works for forks)
+            const numberFile = 'pr-comment/pr-number.txt';
+            if (fs.existsSync(numberFile)) {
+              const number = fs.readFileSync(numberFile, 'utf8').trim();
+              if (number) {
+                core.setOutput('number', number);
+                return;
+              }
+            }
+
             const run = context.payload.workflow_run;
 
             if (run.pull_requests && run.pull_requests.length) {
diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml
index f8d5d384..049c2b5e 100644
--- a/.github/workflows/lighthouse.yml
+++ b/.github/workflows/lighthouse.yml
@@ -1,36 +1,66 @@
 # Adapted from https://github.com/nodejs/nodejs.org/blob/main/.github/workflows/lighthouse.yml
 name: Lighthouse
 
+# Run after the preview is live instead of on pull_request.
 on:
-  pull_request:
-    branches: [main]
+  deployment_status:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  group: ${{ github.workflow }}-${{ github.event.deployment.ref }}
   cancel-in-progress: true
 
 permissions:
   contents: read
+  # for listPullRequestsAssociatedWithCommit below
+  pull-requests: read
 
 jobs:
   lighthouse:
     name: Lighthouse Report
-    if: startsWith(github.event.pull_request.head.ref, 'dependabot/') == false
+    # successful preview deploys only, skip dependabot
+    if: |
+      github.event.deployment_status.state == 'success' &&
+      startsWith(github.event.deployment_status.environment, 'Preview') &&
+      startsWith(github.event.deployment.ref, 'dependabot/') == false
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
 
-      - name: Wait for Vercel preview deployment
+      - name: Resolve preview URL and PR number
         id: preview
-        uses: patrickedqvist/wait-for-vercel-preview@06c79330064b0e6ef7a2574603b62d3c98789125 # v1.3.2
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          max_timeout: 300
-          check_interval: 10
+          script: |
+            const url = context.payload.deployment_status.environment_url;
+
+            // drop trailing slash before appending paths
+            core.setOutput('url', url.replace(/\/+$/, ''));
+
+            // map the deployed commit to its PR (works for forks). best-effort,
+            // don't fail the audit if it doesn't resolve.
+            const sha = context.payload.deployment.sha;
+            try {
+              const { data: prs } =
+                await github.rest.repos.listPullRequestsAssociatedWithCommit({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  commit_sha: sha,
+                });
+
+              const pr = prs.find(p => p.state === 'open') ?? prs[0];
+              if (pr) {
+                core.setOutput('pr_number', String(pr.number));
+              } else {
+                core.info(`No pull request found for ${sha}`);
+              }
+            } catch (error) {
+              core.warning(`Could not resolve PR for ${sha}: ${error.message}`);
+            }
 
       - name: Audit preview URLs with Lighthouse
         id: lighthouse
@@ -67,10 +97,12 @@ jobs:
       - name: Prepare PR comment
         env:
           COMMENT: ${{ steps.format.outputs.comment }}
+          PR_NUMBER: ${{ steps.preview.outputs.pr_number }}
         run: |
           set -euo pipefail
           mkdir -p pr-comment
           printf '%s' "$COMMENT" > pr-comment/comment.md
+          printf '%s' "$PR_NUMBER" > pr-comment/pr-number.txt
 
       - name: Upload PR comment
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2