From b6155b9f0948f5c42e6d206bb156fd9028675e79 Mon Sep 17 00:00:00 2001
From: Luke <lwalton@zebra.com>
Date: Wed, 3 Jul 2024 10:47:59 +0100
Subject: [PATCH 1/2] fix: Add basic error reporting

---
 .github/workflows/pull-request.yml |  2 +-
 .gitignore                         | 11 +++---
 src/main.ts                        | 35 ++++++++++++-------
 src/scripts/analyze.ts             | 10 +++---
 src/scripts/comment.ts             |  9 ++---
 src/scripts/runTests.ts            | 55 ++++++++----------------------
 tests/src/scripts/coverage.test.ts |  6 +---
 tests/src/scripts/runTests.test.ts |  6 +---
 8 files changed, 53 insertions(+), 81 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 90acfc7..305571f 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -37,5 +37,5 @@ jobs:
           git config --global user.name "github-actions"
           git config --global user.email "github-actions@github.com"
           git add -A
-          git commit -m 'ci(automated commit): lint format and import sort'
+          git commit -m 'ci(automated commit): Build bundled file'
           git push
diff --git a/.gitignore b/.gitignore
index bc5bcde..eb986de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,13 +156,14 @@ migrate_working_dir/
 # Flutter/Dart/Pub related
 **/doc/api/
 **/ios/Flutter/.last_build_id
-.dart_tool/
+**/.dart_tool/
 .flutter-plugins
 .flutter-plugins-dependencies
 .pub-cache/
 .pub/
 build/
-
-
-
-**/docs/addver
\ No newline at end of file
+**/docs/addver
+*/package_config_subset
+tests/pass_repo/.dart_tool/package_config_subset
+tests/pass_repo/.dart_tool/package_config.json
+tests/pass_repo/build/test_cache/build/cache.dill.track.dill
diff --git a/src/main.ts b/src/main.ts
index 0ebe432..9d3e478 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,4 +1,4 @@
-import { getInput } from "@actions/core";
+import { getInput, setFailed } from "@actions/core";
 import { getAnalyze } from "./scripts/analyze";
 import { getOctokit, context } from "@actions/github";
 import { getCoverage, getOldCoverage } from "./scripts/coverage";
@@ -11,17 +11,28 @@ import { push } from "./scripts/push";
 export type stepResponse = { output: string; error: boolean };
 
 const run = async () => {
-  const token = process.env.GITHUB_TOKEN || getInput("token");
-  const octokit = getOctokit(token);
-  const behindByStr = await checkBranchStatus(octokit, context);
-  await setup();
-  const oldCoverage: number | undefined = getOldCoverage();
-  const analyzeStr: stepResponse = await getAnalyze();
-  const testStr: stepResponse = await getTest();
-  const coverageStr: stepResponse = await getCoverage(oldCoverage);
-  const comment = createComment(analyzeStr, testStr, coverageStr, behindByStr);
-  postComment(octokit, comment, context);
-  await push();
+  try {
+    const token = process.env.GITHUB_TOKEN || getInput("token");
+    const octokit = getOctokit(token);
+    const behindByStr = await checkBranchStatus(octokit, context);
+    await setup();
+    const oldCoverage: number | undefined = getOldCoverage();
+
+    const analyzeStr: stepResponse = await getAnalyze();
+    const testStr: stepResponse = await getTest();
+    const coverageStr: stepResponse = await getCoverage(oldCoverage);
+
+    const comment = createComment(analyzeStr, testStr, coverageStr, behindByStr);
+
+    postComment(octokit, comment, context);
+    await push();
+
+    if (analyzeStr.error || testStr.error || coverageStr.error) {
+      setFailed(`${analyzeStr.output}\n${testStr.output}\n${coverageStr.output}`);
+    }
+  } catch (err) {
+    setFailed(`Action failed with error ${err}`);
+  }
 };
 
 run();
diff --git a/src/scripts/analyze.ts b/src/scripts/analyze.ts
index a129817..0bc04c9 100644
--- a/src/scripts/analyze.ts
+++ b/src/scripts/analyze.ts
@@ -57,9 +57,9 @@ export const getAnalyze = async (): Promise<stepResponse> => {
     const output = `${ANALYZE_FAILURE}; ${issuesFound}</br>
         <details><summary>See details</summary>
         <table>
-        <tr><th></th><th>Type</th><th>File name</th><th>Details</th></tr>${errorString.join(
-          ""
-        )}${warningString.join("")}${infoString.join("")}</table></details>
+        <tr><th></th><th>Type</th><th>File name</th><th>Details</th></tr>${errorString.join("")}${warningString.join(
+      ""
+    )}${infoString.join("")}</table></details>
         `;
 
     response = { output: output, error: true };
@@ -84,6 +84,4 @@ export const getErrEmoji = (errType: analyzeErrTypes) => {
 };
 
 export const generateTableRow = (err: analyzeDetails, type: analyzeErrTypes) =>
-  `<tr><td>${getErrEmoji(type)}</td><td>Error</td><td>${err.file}</td><td>${
-    err.details
-  }</td></tr>`;
+  `<tr><td>${getErrEmoji(type)}</td><td>Error</td><td>${err.file}</td><td>${err.details}</td></tr>`;
diff --git a/src/scripts/comment.ts b/src/scripts/comment.ts
index d3e77da..8798115 100644
--- a/src/scripts/comment.ts
+++ b/src/scripts/comment.ts
@@ -11,8 +11,7 @@ export const createComment = (
   coverage: stepResponse,
   behindBy: stepResponse
 ): string => {
-  const isSuccess =
-    !analyze.error && !test.error && !coverage.error && !behindBy.error;
+  const isSuccess = !analyze.error && !test.error && !coverage.error && !behindBy.error;
 
   let output = `<h2>PR Checks complete</h2>
 <ul>
@@ -29,11 +28,7 @@ ${SIGNATURE}
   return output;
 };
 
-export async function postComment(
-  octokit: InstanceType<typeof GitHub>,
-  commentMessage: string,
-  context: Context
-) {
+export async function postComment(octokit: InstanceType<typeof GitHub>, commentMessage: string, context: Context) {
   startGroup(`Commenting on PR`);
 
   const pr = {
diff --git a/src/scripts/runTests.ts b/src/scripts/runTests.ts
index c2b2b9e..cbad047 100644
--- a/src/scripts/runTests.ts
+++ b/src/scripts/runTests.ts
@@ -24,16 +24,11 @@ export const getTest = async (): Promise<stepResponse> => {
       const objStr = "[" + stdout.split("\n").join(",").slice(0, -1) + "]";
       const obj = JSON.parse(objStr);
       let failIds: string[] = [];
-      obj.forEach(
-        (element: { type: string; result: string; testID: string }) => {
-          if (
-            element.type == "testDone" &&
-            element.result.toLowerCase() == "error"
-          ) {
-            failIds.push(element.testID);
-          }
+      obj.forEach((element: { type: string; result: string; testID: string }) => {
+        if (element.type == "testDone" && element.result.toLowerCase() == "error") {
+          failIds.push(element.testID);
         }
-      );
+      });
       let initialString = "";
       if (failIds.length > 1) {
         initialString = `${failIds.length} tests failed`;
@@ -50,43 +45,29 @@ export const getTest = async (): Promise<stepResponse> => {
             test: { hasOwnProperty: (arg0: string) => any; id: any };
           }) =>
             (e.hasOwnProperty("testID") && e.testID == e1) ||
-            (e.hasOwnProperty("test") &&
-              e.test.hasOwnProperty("id") &&
-              e.test.id == e1)
+            (e.hasOwnProperty("test") && e.test.hasOwnProperty("id") && e.test.id == e1)
         );
         const entry1 = allEntries.find(
-          (e: {
-            hasOwnProperty: (arg0: string) => any;
-            test: { hasOwnProperty: (arg0: string) => any };
-          }) => e.hasOwnProperty("test") && e.test.hasOwnProperty("id")
+          (e: { hasOwnProperty: (arg0: string) => any; test: { hasOwnProperty: (arg0: string) => any } }) =>
+            e.hasOwnProperty("test") && e.test.hasOwnProperty("id")
         );
         let testName = "Error getting test name";
         if (entry1) {
           testName = entry1.test.name.split("/test/").slice(-1);
         }
         const entry2 = allEntries.find(
-          (e: {
-            hasOwnProperty: (arg0: string) => any;
-            stackTrace: string | any[];
-          }) => e.hasOwnProperty("stackTrace") && e.stackTrace.length > 1
+          (e: { hasOwnProperty: (arg0: string) => any; stackTrace: string | any[] }) =>
+            e.hasOwnProperty("stackTrace") && e.stackTrace.length > 1
         );
         const entry3 = allEntries.find(
-          (e: {
-            hasOwnProperty: (arg0: string) => any;
-            message: string | string[];
-          }) =>
-            e.hasOwnProperty("message") &&
-            e.message.length > 1 &&
-            e.message.includes("EXCEPTION CAUGHT BY FLUTTER")
+          (e: { hasOwnProperty: (arg0: string) => any; message: string | string[] }) =>
+            e.hasOwnProperty("message") && e.message.length > 1 && e.message.includes("EXCEPTION CAUGHT BY FLUTTER")
         );
         const entry4 = allEntries.find(
-          (e: {
-            hasOwnProperty: (arg0: string) => any;
-            error: string | any[];
-          }) => e.hasOwnProperty("error") && e.error.length > 1
+          (e: { hasOwnProperty: (arg0: string) => any; error: string | any[] }) =>
+            e.hasOwnProperty("error") && e.error.length > 1
         );
-        let testDetails =
-          "Unable to get test details. Run flutter test to replicate";
+        let testDetails = "Unable to get test details. Run flutter test to replicate";
         if (entry2) {
           testDetails = entry2.stackTrace;
         } else if (entry3) {
@@ -95,13 +76,7 @@ export const getTest = async (): Promise<stepResponse> => {
           testDetails = entry4.error;
         }
 
-        errorString.push(
-          "<details><summary>" +
-            testName +
-            "</br></summary>`" +
-            testDetails +
-            "`</details>"
-        );
+        errorString.push("<details><summary>" + testName + "</br></summary>`" + testDetails + "`</details>");
       });
 
       const output = `⛔️ - ${initialString}</br >
diff --git a/tests/src/scripts/coverage.test.ts b/tests/src/scripts/coverage.test.ts
index 483da12..bf5ff55 100644
--- a/tests/src/scripts/coverage.test.ts
+++ b/tests/src/scripts/coverage.test.ts
@@ -1,10 +1,6 @@
 import { exec, execSync } from "child_process";
 import { stepResponse } from "../../../src/main";
-import {
-  COV_FAILURE,
-  getCoverage,
-  getOldCoverage,
-} from "../../../src/scripts/coverage";
+import { COV_FAILURE, getCoverage, getOldCoverage } from "../../../src/scripts/coverage";
 const oldCoverage = 83.33;
 
 test("should return stepResponse object", () => {
diff --git a/tests/src/scripts/runTests.test.ts b/tests/src/scripts/runTests.test.ts
index a0a48e5..d540cf4 100644
--- a/tests/src/scripts/runTests.test.ts
+++ b/tests/src/scripts/runTests.test.ts
@@ -1,8 +1,4 @@
-import {
-  getTest,
-  TEST_ERROR,
-  TEST_SUCCESS,
-} from "../../../src/scripts/runTests";
+import { getTest, TEST_ERROR, TEST_SUCCESS } from "../../../src/scripts/runTests";
 
 test("all tests pass", async () => {
   process.chdir("tests/pass_repo");

From 6b43972165c60da3c65175612ebdc7445e23571c Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 3 Jul 2024 09:58:21 +0000
Subject: [PATCH 2/2] ci(automated commit): lint format and import sort

---
 dist/index.js | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 3ca252b..1f8f232 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -30776,8 +30776,7 @@ const getTest = async () => {
             const obj = JSON.parse(objStr);
             let failIds = [];
             obj.forEach((element) => {
-                if (element.type == "testDone" &&
-                    element.result.toLowerCase() == "error") {
+                if (element.type == "testDone" && element.result.toLowerCase() == "error") {
                     failIds.push(element.testID);
                 }
             });
@@ -30791,18 +30790,14 @@ const getTest = async () => {
             const errorString = [];
             failIds.forEach((e1) => {
                 const allEntries = obj.filter((e) => (e.hasOwnProperty("testID") && e.testID == e1) ||
-                    (e.hasOwnProperty("test") &&
-                        e.test.hasOwnProperty("id") &&
-                        e.test.id == e1));
+                    (e.hasOwnProperty("test") && e.test.hasOwnProperty("id") && e.test.id == e1));
                 const entry1 = allEntries.find((e) => e.hasOwnProperty("test") && e.test.hasOwnProperty("id"));
                 let testName = "Error getting test name";
                 if (entry1) {
                     testName = entry1.test.name.split("/test/").slice(-1);
                 }
                 const entry2 = allEntries.find((e) => e.hasOwnProperty("stackTrace") && e.stackTrace.length > 1);
-                const entry3 = allEntries.find((e) => e.hasOwnProperty("message") &&
-                    e.message.length > 1 &&
-                    e.message.includes("EXCEPTION CAUGHT BY FLUTTER"));
+                const entry3 = allEntries.find((e) => e.hasOwnProperty("message") && e.message.length > 1 && e.message.includes("EXCEPTION CAUGHT BY FLUTTER"));
                 const entry4 = allEntries.find((e) => e.hasOwnProperty("error") && e.error.length > 1);
                 let testDetails = "Unable to get test details. Run flutter test to replicate";
                 if (entry2) {
@@ -30814,11 +30809,7 @@ const getTest = async () => {
                 else if (entry4) {
                     testDetails = entry4.error;
                 }
-                errorString.push("<details><summary>" +
-                    testName +
-                    "</br></summary>`" +
-                    testDetails +
-                    "`</details>");
+                errorString.push("<details><summary>" + testName + "</br></summary>`" + testDetails + "`</details>");
             });
             const output = `⛔️ - ${initialString}</br >
             <details><summary>See details</summary>
@@ -33152,17 +33143,25 @@ const setup_1 = __nccwpck_require__(9346);
 const behind_1 = __nccwpck_require__(8890);
 const push_1 = __nccwpck_require__(3662);
 const run = async () => {
-    const token = process.env.GITHUB_TOKEN || (0, core_1.getInput)("token");
-    const octokit = (0, github_1.getOctokit)(token);
-    const behindByStr = await (0, behind_1.checkBranchStatus)(octokit, github_1.context);
-    await (0, setup_1.setup)();
-    const oldCoverage = (0, coverage_1.getOldCoverage)();
-    const analyzeStr = await (0, analyze_1.getAnalyze)();
-    const testStr = await (0, runTests_1.getTest)();
-    const coverageStr = await (0, coverage_1.getCoverage)(oldCoverage);
-    const comment = (0, comment_1.createComment)(analyzeStr, testStr, coverageStr, behindByStr);
-    (0, comment_1.postComment)(octokit, comment, github_1.context);
-    await (0, push_1.push)();
+    try {
+        const token = process.env.GITHUB_TOKEN || (0, core_1.getInput)("token");
+        const octokit = (0, github_1.getOctokit)(token);
+        const behindByStr = await (0, behind_1.checkBranchStatus)(octokit, github_1.context);
+        await (0, setup_1.setup)();
+        const oldCoverage = (0, coverage_1.getOldCoverage)();
+        const analyzeStr = await (0, analyze_1.getAnalyze)();
+        const testStr = await (0, runTests_1.getTest)();
+        const coverageStr = await (0, coverage_1.getCoverage)(oldCoverage);
+        const comment = (0, comment_1.createComment)(analyzeStr, testStr, coverageStr, behindByStr);
+        (0, comment_1.postComment)(octokit, comment, github_1.context);
+        await (0, push_1.push)();
+        if (analyzeStr.error || testStr.error || coverageStr.error) {
+            (0, core_1.setFailed)(`${analyzeStr.output}\n${testStr.output}\n${coverageStr.output}`);
+        }
+    }
+    catch (err) {
+        (0, core_1.setFailed)(`Action failed with error ${err}`);
+    }
 };
 run();