Allow matching SHA to be canceled

action.yml

@@ -8,6 +8,10 @@ inputs:
   workflow_id:
     description: 'Optional - A single Workflow ID or a comma separated list of IDs'
     required: false
+  ignore_sha:
+    description: 'Optional - Allow canceling other workflows with the same SHA. Useful for the `pull_request.closed` event.'
+    required: false
+    default: false
   access_token:
     description: 'Your GitHub Access Token, defaults to: {{ github.token }}'
     default: '${{ github.token }}'

dist/index.js

@@ -5859,6 +5859,7 @@ async function main() {
     console.log({ eventName, sha, headSha, branch, owner, repo, GITHUB_RUN_ID });
     const token = core.getInput('access_token', { required: true });
     const workflow_id = core.getInput('workflow_id', { required: false });
+    const ignore_sha = core.getInput('ignore_sha', { required: false }) === 'true';
     console.log(`Found token: ${token ? 'yes' : 'no'}`);
     const workflow_ids = [];
     const octokit = github.getOctokit(token);
@@ -5885,9 +5886,13 @@ async function main() {
                 branch,
             });
             console.log(`Found ${data.total_count} runs total.`);
-            const runningWorkflows = data.workflow_runs.filter(run => run.head_branch === branch && run.head_sha !== headSha && run.status !== 'completed' &&
+            console.log(data.workflow_runs.map(run => `- ${run.html_url}`).join("\n"));
+            const runningWorkflows = data.workflow_runs.filter(run => run.head_branch === branch &&
+                (ignore_sha || run.head_sha !== headSha) &&
+                run.status !== 'completed' &&
                 new Date(run.created_at) < new Date(current_run.created_at));
-            console.log(`Found ${runningWorkflows.length} runs in progress.`);
+            console.log(`Found ${runningWorkflows.length} runs in to cancel.`);
+            console.log(runningWorkflows.map(run => `- ${run.html_url}`).join('\n'));
             for (const { id, head_sha, status } of runningWorkflows) {
                 console.log('Cancelling another run: ', { id, head_sha, status });
                 const res = await octokit.actions.cancelWorkflowRun({
@@ -6063,4 +6068,4 @@ module.exports = require("zlib");
 /******/ 	// Load entry module and return exports
 /******/ 	return __webpack_require__(144);
 /******/ })()
-;
+;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cancel-workflow-action",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "main": "dist/index.js",
   "license": "MIT",
   "scripts": {

src/index.ts

@@ -23,6 +23,7 @@ async function main() {
   console.log({ eventName, sha, headSha, branch, owner, repo, GITHUB_RUN_ID });
   const token = core.getInput('access_token', { required: true });
   const workflow_id = core.getInput('workflow_id', { required: false });
+  const allow_matching_sha = core.getInput('allow_matching_sha', { required: true }) === 'true';
   console.log(`Found token: ${token ? 'yes' : 'no'}`);
   const workflow_ids: string[] = [];
   const octokit = github.getOctokit(token);
@@ -55,11 +56,17 @@ async function main() {
         branch,
       });
       console.log(`Found ${data.total_count} runs total.`);
+      console.log(data.workflow_runs.map(run => `- ${run.html_url}`).join("\n"));
+
       const runningWorkflows = data.workflow_runs.filter(
-        run => run.head_branch === branch && run.head_sha !== headSha && run.status !== 'completed' &&
-            new Date(run.created_at) < new Date(current_run.created_at)
+        run => run.head_branch === branch && 
+               (allow_matching_sha || run.head_sha !== headSha) &&
+               run.status !== 'completed' &&
+               new Date(run.created_at) < new Date(current_run.created_at)
       );
-      console.log(`Found ${runningWorkflows.length} runs in progress.`);
+      console.log(`Found ${runningWorkflows.length} runs in to cancel.`);
+      console.log(runningWorkflows.map(run => `- ${run.html_url}`).join("\n"));
+
       for (const {id, head_sha, status} of runningWorkflows) {
         console.log('Cancelling another run: ', {id, head_sha, status});
         const res = await octokit.actions.cancelWorkflowRun({