next attempt

adobecom · Nov 20, 2024 · 7d6142e · 7d6142e
1 parent 314f7c0
commit 7d6142e
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/scripts/record-web-vitals.js b/scripts/record-web-vitals.js
@@ -7,13 +7,25 @@ const execPromise = util.promisify(exec);
 async function collectMetrics() {
     // Check for both PR merge and direct push to main
     const isMergeContext = (
+        // If we have PR_NUMBER, treat it as a PR merge
+        process.env.PR_NUMBER ||
+        // Otherwise use the original conditions
         (process.env.GITHUB_EVENT_NAME === 'pull_request' &&
             process.env.GITHUB_EVENT_ACTION === 'closed' &&
             process.env.GITHUB_PULL_REQUEST_MERGED === 'true') ||
         (process.env.GITHUB_EVENT_NAME === 'push' &&
             process.env.GITHUB_REF === 'refs/heads/main')
     );
 
+    // Always use PR information if available
+    const prInfo = process.env.PR_NUMBER ? {
+        number: process.env.PR_NUMBER,
+        title: process.env.PR_TITLE
+    } : {
+        number: process.env.GITHUB_SHA?.substring(0, 7) || 'unknown',
+        title: 'Direct push to main'
+    };
+
     console.log('Environment variables:', {
         GITHUB_EVENT_NAME: process.env.GITHUB_EVENT_NAME,
         GITHUB_EVENT_ACTION: process.env.GITHUB_EVENT_ACTION,
@@ -61,13 +73,7 @@ async function collectMetrics() {
 
                 const record = {
                     date: new Date().toISOString(),
-                    pr: process.env.GITHUB_EVENT_NAME === 'pull_request' ? {
-                        number: process.env.PR_NUMBER || 'unknown',
-                        title: process.env.PR_TITLE || 'unknown'
-                    } : {
-                        number: process.env.GITHUB_SHA?.substring(0, 7) || 'unknown',
-                        title: 'Direct push to main'
-                    },
+                    pr: prInfo,
                     metrics: currentMetrics.metrics
                 };