fix: normalize workflow_id env and use try/catch

Author: jordanpowell88

action.yml

@@ -47,9 +47,9 @@ runs:
         error_on_no_successful_workflow: ${{ inputs.error-on-no-successful-workflow }}
         last_successful_event: ${{ inputs.last-successful-event }}
         working_directory: ${{ inputs.working-directory }}
-        working_id: ${{ inputs.workflow-id }}
+        workflow_id: ${{ inputs.workflow-id }}
         fallback_sha: ${{ inputs.fallback-sha }}
-      run: node "$GITHUB_ACTION_PATH/dist/index.js" "$gh_token" "$main_branch_name" "$error_on_no_successful_workflow" "$last_successful_event" "$working_directory" "$working_id" "$fallback_sha"
+      run: node "$GITHUB_ACTION_PATH/dist/index.js" "$gh_token" "$main_branch_name" "$error_on_no_successful_workflow" "$last_successful_event" "$working_directory" "$workflow_id" "$fallback_sha"
 
     - name: Log base and head SHAs used for nx affected
       shell: bash

dist/index.js

@@ -64987,16 +64987,21 @@ function findSuccessfulCommit(workflow_id, run_id, owner, repo, branch, lastSucc
     return __awaiter(this, void 0, void 0, function* () {
         const octokit = new ProxifiedClient();
         if (!workflow_id) {
-            workflow_id = yield octokit
-                .request(`GET /repos/${owner}/${repo}/actions/runs/${run_id}`, {
-                owner,
-                repo,
-                branch,
-                run_id,
-            })
-                .then(({ data: { workflow_id } }) => workflow_id);
-            process.stdout.write('\n');
-            process.stdout.write(`Workflow Id not provided. Using workflow '${workflow_id}'\n`);
+            try {
+                const response = yield octokit.request(`GET /repos/${owner}/${repo}/actions/runs/${run_id}`, {
+                    owner,
+                    repo,
+                    branch,
+                    run_id,
+                });
+                workflow_id = response.data.workflow_id;
+                process.stdout.write('\n');
+                process.stdout.write(`Workflow Id not provided. Using workflow '${workflow_id}'\n`);
+            }
+            catch (e) {
+                console.error('Error fetching workflow id', e);
+                throw e;
+            }
         }
         // fetch all workflow runs on a given repo/branch/workflow with push and success
         const shas = yield octokit

find-successful-workflow.ts

@@ -166,18 +166,25 @@ async function findSuccessfulCommit(
 ): Promise<string | undefined> {
   const octokit = new ProxifiedClient();
   if (!workflow_id) {
-    workflow_id = await octokit
-      .request(`GET /repos/${owner}/${repo}/actions/runs/${run_id}`, {
-        owner,
-        repo,
-        branch,
-        run_id,
-      })
-      .then(({ data: { workflow_id } }) => workflow_id);
-    process.stdout.write('\n');
-    process.stdout.write(
-      `Workflow Id not provided. Using workflow '${workflow_id}'\n`,
-    );
+    try {
+      const response = await octokit.request(
+        `GET /repos/${owner}/${repo}/actions/runs/${run_id}`,
+        {
+          owner,
+          repo,
+          branch,
+          run_id,
+        },
+      );
+      workflow_id = response.data.workflow_id;
+      process.stdout.write('\n');
+      process.stdout.write(
+        `Workflow Id not provided. Using workflow '${workflow_id}'\n`,
+      );
+    } catch (e) {
+      console.error('Error fetching workflow id', e);
+      throw e;
+    }
   }
   // fetch all workflow runs on a given repo/branch/workflow with push and success
   const shas = await octokit