fix cancelling jobs from different repos where two branches have the …

…same name (#105) Co-authored-by: Steven <steven@ceriously.com>
styfle · Jul 29, 2021 · a66ae1f · a66ae1f
1 parent b54f1a5
commit a66ae1f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/dist/index.js b/dist/index.js
@@ -6122,6 +6122,7 @@ async function main() {
         workflow_ids.push(String(current_run.workflow_id));
     }
     console.log(`Found workflow_id: ${JSON.stringify(workflow_ids)}`);
+    const trigger_repo_id = (payload.workflow_run || current_run).head_repository.id;
     await Promise.all(workflow_ids.map(async (workflow_id) => {
         try {
             const { data: { total_count, workflow_runs }, } = await octokit.actions.listWorkflowRuns({
@@ -6139,7 +6140,8 @@ async function main() {
                     .reduce((a, b) => Math.max(a, b), cancelBefore.getTime());
                 cancelBefore = new Date(n);
             }
-            const runningWorkflows = workflow_runs.filter(run => run.id !== current_run.id &&
+            const runningWorkflows = workflow_runs.filter(run => run.head_repository.id === trigger_repo_id &&
+                run.id !== current_run.id &&
                 (ignore_sha || run.head_sha !== headSha) &&
                 run.status !== 'completed' &&
                 new Date(run.created_at) < cancelBefore);

diff --git a/src/index.ts b/src/index.ts
@@ -55,6 +55,7 @@ async function main() {
     workflow_ids.push(String(current_run.workflow_id));
   }
   console.log(`Found workflow_id: ${JSON.stringify(workflow_ids)}`);
+  const trigger_repo_id = (payload.workflow_run || current_run).head_repository.id;
   await Promise.all(
     workflow_ids.map(async workflow_id => {
       try {
@@ -78,6 +79,7 @@ async function main() {
         }
         const runningWorkflows = workflow_runs.filter(
           run =>
+            run.head_repository.id === trigger_repo_id &&
             run.id !== current_run.id &&
             (ignore_sha || run.head_sha !== headSha) &&
             run.status !== 'completed' &&