Included branch parameter to filter runs

README.md

@@ -10,6 +10,7 @@ proceeding with the next steps in your workflow.
 - `repository`: The repository in the format 'owner/repository'. It is used to
   fetch the workflow runs. If not provided, it falls back to the current
   repository (default: `github.context.repo.owner/github.context.repo.repo`).
+- `branch`: The branch to fetch the workflow runs (If not provided, considers all branches.)
 - `retryIntervalSeconds`: The number of seconds to wait between each retry
   (default: 60).
 - `timeoutSeconds`: The maximum number of seconds to wait before timing out

action.yml

@@ -17,6 +17,10 @@ inputs:
       'The repository in the format owner/repo to fetch the workflow runs
       (default is the current repository)'
 
+  branch:
+    description:
+      'The branch to fetch the workflow runs (If not provided, considers all branches)'
+
   retryIntervalSeconds:
     description: 'Retry interval in seconds'
     default: '60'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "await-workflow",
   "description": "This GitHub Action allows you to wait for a specific workflow to complete before proceeding with the next steps in your workflow.",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Johannes Vedder",
   "private": true,
   "repository": {

src/main.ts

@@ -7,6 +7,7 @@
     repository:
       core.getInput('repository') ||
       `${github.context.repo.owner}/${github.context.repo.repo}`,
+    branch: core.getInput('branch'),
     retryIntervalSeconds: Number(core.getInput('retryIntervalSeconds')),
     timeoutSeconds: Number(core.getInput('timeoutSeconds')),
     initialWaitSeconds: Number(core.getInput('initialWaitSeconds')),
@@ -34,7 +35,13 @@
       }
     )
 
-    const latestWorkflowRun = response.data.workflow_runs?.[0]
+    let workflow_runs = response.data.workflow_runs;
+
+    if (inputs.branch){
+      workflow_runs = workflow_runs?.filter(run => run.head_branch === inputs.branch);
+    }
+
+    const latestWorkflowRun = workflow_runs?.[0]
     const totalCounts = response.data.total_count
 
     if (totalCounts === 0) {
@@ -44,6 +51,7 @@
 
     const latestRunStatus = latestWorkflowRun?.status
     const latestRunConclusion = latestWorkflowRun?.conclusion
+    const latestRunBranch = latestWorkflowRun?.head_branch
 
     if (latestRunStatus === 'completed') {
       if (
@@ -55,11 +63,11 @@
         )
         break
       } else if (latestRunConclusion === 'failure') {
-        core.setFailed('Latest run of the given workflow was a failure')
+        core.setFailed(`Latest run of the given workflow in branch ${latestRunBranch} was a failure`)
         process.exit(1)
       } else {
         core.setFailed(
-          `Latest run of the given workflow was not successful [${latestRunStatus}]`
+          `Latest run of the given workflow in branch ${latestRunBranch} was not successful [${latestRunStatus}]`
         )
         process.exit(1)
       }