add more try catch

Author: jordanpowell88

.github/workflows/integration-test-workflow.yml

@@ -66,10 +66,3 @@ jobs:
           HEAD_SHA=$(echo $(git rev-parse HEAD))
           node -e "if(process.env.NX_BASE == '${BASE_SHA}') console.log('Base set correctly'); else { throw new Error('Base not set correctly!');}"
           node -e "if(process.env.NX_HEAD == '${HEAD_SHA}') console.log('Head set correctly'); else { throw new Error('Head not set correctly!');}"
-      
-      - name: Verify workflow-id
-        if: ${{ inputs.workflow-id != '' }}
-        run: |
-          echo "NX_BASE: $NX_BASE"
-          echo "NX_HEAD: $NX_HEAD"
-          echo "NX_WORKFLOW_ID: $NX_WORKFLOW_ID"  

.github/workflows/test-integration.yml

@@ -24,4 +24,4 @@ jobs:
       working-directory: integration-test
       main-branch-name: ${{ github.event_name == 'pull_request' && github.base_ref || github.ref_name }}
       runs-on: ${{ matrix.runs-on }}
-      workflow-id: ${{ github.workflow }}
+      workflow-id: test-integration.yml

dist/index.js

@@ -65004,21 +65004,26 @@ function findSuccessfulCommit(workflow_id, run_id, owner, repo, branch, lastSucc
             }
         }
         // fetch all workflow runs on a given repo/branch/workflow with push and success
-        const shas = yield octokit
-            .request(`GET /repos/${owner}/${repo}/actions/workflows/${workflow_id}/runs`, {
-            owner,
-            repo,
-            // on some workflow runs we do not have branch property
-            branch: lastSuccessfulEvent === 'push' ||
-                lastSuccessfulEvent === 'workflow_dispatch'
-                ? branch
-                : undefined,
-            workflow_id,
-            event: lastSuccessfulEvent,
-            status: 'success',
-        })
-            .then(({ data: { workflow_runs } }) => workflow_runs.map((run) => run.head_sha));
-        return yield findExistingCommit(octokit, branch, shas);
+        try {
+            const response = yield octokit.request(`GET /repos/${owner}/${repo}/actions/workflows/${workflow_id}/runs`, {
+                owner,
+                repo,
+                // on some workflow runs we do not have branch property
+                branch: lastSuccessfulEvent === 'push' ||
+                    lastSuccessfulEvent === 'workflow_dispatch'
+                    ? branch
+                    : undefined,
+                workflow_id,
+                event: lastSuccessfulEvent,
+                status: 'success',
+            });
+            const shas = response.data.workflow_runs.map((run) => run.head_sha);
+            return yield findExistingCommit(octokit, branch, shas);
+        }
+        catch (e) {
+            console.error('Error fetching workflow runs', e);
+            throw e;
+        }
     });
 }
 function findMergeBaseRef() {
@@ -65046,8 +65051,14 @@ function findMergeQueueBranch() {
         process.stdout.write('\n');
         process.stdout.write(`Found PR #${pull_number} from merge queue branch\n`);
         const octokit = new ProxifiedClient();
-        const result = yield octokit.request(`GET /repos/${owner}/${repo}/pulls/${pull_number}`, { owner, repo, pull_number: +pull_number });
-        return result.data.head.ref;
+        try {
+            const result = yield octokit.request(`GET /repos/${owner}/${repo}/pulls/${pull_number}`, { owner, repo, pull_number: +pull_number });
+            return result.data.head.ref;
+        }
+        catch (e) {
+            console.error('Error fetching merge queue branch', e);
+            throw e;
+        }
     });
 }
 /**

find-successful-workflow.ts

@@ -187,8 +187,8 @@ async function findSuccessfulCommit(
     }
   }
   // fetch all workflow runs on a given repo/branch/workflow with push and success
-  const shas = await octokit
-    .request(
+  try {
+    const response = await octokit.request(
       `GET /repos/${owner}/${repo}/actions/workflows/${workflow_id}/runs`,
       {
         owner,
@@ -203,12 +203,16 @@ async function findSuccessfulCommit(
         event: lastSuccessfulEvent,
         status: 'success',
       },
-    )
-    .then(({ data: { workflow_runs } }) =>
-      workflow_runs.map((run: { head_sha: any }) => run.head_sha),
+    );
+    const shas = response.data.workflow_runs.map(
+      (run: { head_sha: any }) => run.head_sha,
     );
 
-  return await findExistingCommit(octokit, branch, shas);
+    return await findExistingCommit(octokit, branch, shas);
+  } catch (e) {
+    console.error('Error fetching workflow runs', e);
+    throw e;
+  }
 }
 
 async function findMergeBaseRef(): Promise<string> {
@@ -236,11 +240,17 @@ async function findMergeQueueBranch(): Promise<string> {
   process.stdout.write('\n');
   process.stdout.write(`Found PR #${pull_number} from merge queue branch\n`);
   const octokit = new ProxifiedClient();
-  const result = await octokit.request(
-    `GET /repos/${owner}/${repo}/pulls/${pull_number}`,
-    { owner, repo, pull_number: +pull_number },
-  );
-  return result.data.head.ref;
+
+  try {
+    const result = await octokit.request(
+      `GET /repos/${owner}/${repo}/pulls/${pull_number}`,
+      { owner, repo, pull_number: +pull_number },
+    );
+    return result.data.head.ref;
+  } catch (e) {
+    console.error('Error fetching merge queue branch', e);
+    throw e;
+  }
 }
 
 /**