Scope E2E workflow cancellation to the triggering PR branch.

Cross-PR pushes were cancelling unrelated in-flight Electron Playwright Tests runs because cancelActiveE2ERuns aborted every active workflow. Match runs by head_branch so only the same PR's stale runs are stopped.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: yasserfaraazkhan

.github/workflows/e2e-functional.yml

@@ -388,4 +388,5 @@ jobs:
         with:
           name: policy-test-results-${{ runner.os }}
           path: e2e/playwright-report
+          if-no-files-found: ignore
           retention-days: 7

.github/workflows/e2e-pr-trigger.yml

@@ -9,13 +9,9 @@ name: E2E PR Trigger
 # opened/synchronize events do not add E2E/Run, and applying the override label
 # strips E2E/Run and cancels in-flight E2E runs.
 #
-# On synchronize: in-progress Electron Playwright Tests runs are cancelled before
-# re-adding the label so stale runs for the old commit don't block the new one.
-# Matterwick dispatches e2e-functional.yml via workflow_dispatch using the default
-# branch as the ref (so all E2E runs show head_branch: master). This makes it
-# impossible to distinguish runs by PR branch, so all in-progress E2E runs are
-# cancelled — which is correct behaviour since only one labelled PR triggers tests
-# at a time in this project.
+# On synchronize: in-progress Electron Playwright Tests runs for this PR are
+# cancelled before re-adding the label so stale runs for the old commit do not
+# block the new one. Runs on other PR branches are left running.
 #
 # The concurrency group ensures rapid pushes to the same PR don't queue multiple
 # label operations: only the most recent push proceeds.
@@ -87,7 +83,12 @@ jobs:
                 }
               }
 
-              await cancelActiveE2ERuns({ github, context });
+              await cancelActiveE2ERuns({
+                github,
+                context,
+                prNumber: issue_number,
+                headBranch: pr.head.ref,
+              });
               await markE2EStatusesCancelled({
                 github,
                 context,
@@ -97,7 +98,12 @@ jobs:
               return;
             }
 
-            await cancelActiveE2ERuns({ github, context });
+            await cancelActiveE2ERuns({
+              github,
+              context,
+              prNumber: issue_number,
+              headBranch: pr.head.ref,
+            });
 
             try {
               await github.rest.issues.removeLabel({
@@ -151,7 +157,12 @@ jobs:
               }
             }
 
-            await cancelActiveE2ERuns({ github, context });
+            await cancelActiveE2ERuns({
+              github,
+              context,
+              prNumber: issue_number,
+              headBranch: pr.head.ref,
+            });
             await markE2EStatusesCancelled({
               github,
               context,

e2e/utils/github-actions.js

@@ -152,12 +152,45 @@ async function markE2EStatusesCancelled({github, context, sha, reason = CANCELLE
 }
 
 /**
- * Cancel all active Electron Playwright Tests workflow runs.
- * Matterwick dispatches via workflow_dispatch on the default branch, so runs
- * cannot be filtered reliably by PR branch — cancel every active run instead.
+ * Return true when a workflow run belongs to the given PR.
+ * Matterwick dispatches with version_name set to the PR head branch, so
+ * head_branch on the run matches pull_request.head.ref.
  */
-async function cancelActiveE2ERuns({github, context}) {
+function runBelongsToPr(run, headBranch) {
+    return Boolean(headBranch && run.head_branch === headBranch);
+}
+
+async function resolvePrHeadBranch({github, context, prNumber, headBranch}) {
+    if (headBranch) {
+        return headBranch;
+    }
+
+    if (!prNumber) {
+        return null;
+    }
+
+    const {data: pr} = await github.rest.pulls.get({
+        owner: context.repo.owner,
+        repo: context.repo.repo,
+        pull_number: prNumber,
+    });
+    return pr.head.ref;
+}
+
+/**
+ * Cancel active Electron Playwright Tests runs for a single PR.
+ * Only runs whose head_branch matches the PR branch are cancelled so concurrent
+ * E2E runs on other PRs are not interrupted.
+ */
+async function cancelActiveE2ERuns({github, context, prNumber, headBranch}) {
     const {owner, repo} = context.repo;
+    const branch = await resolvePrHeadBranch({github, context, prNumber, headBranch});
+
+    if (!branch) {
+        console.log('cancelActiveE2ERuns: no PR branch resolved — skipping cancellation');
+        return 0;
+    }
+
     const {data: {workflows}} = await github.rest.actions.listRepoWorkflows({owner, repo});
     const e2eWorkflow = workflows.find((workflow) => workflow.name === E2E_WORKFLOW_NAME);
 
@@ -178,9 +211,14 @@ async function cancelActiveE2ERuns({github, context}) {
         });
 
         for (const run of workflowRuns) {
+            if (!runBelongsToPr(run, branch)) {
+                console.log(`Skipping E2E run ${run.id} (branch ${run.head_branch ?? 'unknown'} != ${branch})`);
+                continue;
+            }
+
             try {
                 await github.rest.actions.cancelWorkflowRun({owner, repo, run_id: run.id});
-                console.log(`Cancelled E2E run ${run.id} (status: ${status})`);
+                console.log(`Cancelled E2E run ${run.id} for branch ${branch} (status: ${status})`);
                 cancelled += 1;
             } catch (error) {
                 console.log(`Could not cancel run ${run.id}: ${error.message}`);