Exclude current workflow from successful workflow determination (#17)

viveklak · Mar 22, 2023 · f571240 · f571240
1 parent 4da7c5b
commit f571240
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -77,7 +77,12 @@ async function main(): Promise<void> {
       )
     })
   } catch (error) {
-    if (error instanceof Error) core.setFailed(error.message)
+    if (error instanceof Error) {
+      core.error(
+        error.stack ? `${error.message}:\n${error.stack}` : error.message
+      )
+      core.setFailed(error.message)
+    }
   }
 }
 

diff --git a/src/run.ts b/src/run.ts
@@ -62,8 +62,13 @@ export async function run(opts: RunOpts): Promise<void> {
           status: 'success',
           per_page: 10
         })
-        if (completed.data.workflow_runs.length > 0) {
-          const [first] = completed.data.workflow_runs
+        // We may be run as a dispatch workflow from the currentWorkflowRunId which
+        // could be marked as complete already. Filter it out.
+        const previouslyCompleted = completed.data.workflow_runs.filter(
+          w => w.id !== opts.currentWorkflowRunId
+        )
+        if (previouslyCompleted.length > 0) {
+          const [first] = previouslyCompleted
           lastCommit = first.head_sha
           core.info(
             `Last successfully completed workflow run: ${first.id} for commit: ${lastCommit}`