Merge branch 'main' into simon-engledew/lint-workspace

github · Nov 26, 2020 · 92df387 · 92df387
2 parents be09fb3 + 7d74882
commit 92df387
Showing 17 changed files with 89 additions and 42 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -49,8 +49,7 @@
             "@typescript-eslint/prefer-regexp-exec": "off",
             "@typescript-eslint/require-await": "off",
             "@typescript-eslint/restrict-template-expressions": "off",
-            "func-style": "off",
-            "github/no-then": "off"
+            "func-style": "off"
         }
     }]
 }
diff --git a/lib/actions-util.js.map b/lib/actions-util.js.map
diff --git a/lib/analyze-action.js b/lib/analyze-action.js
diff --git a/lib/analyze-action.js.map b/lib/analyze-action.js.map
diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js
diff --git a/lib/autobuild-action.js.map b/lib/autobuild-action.js.map
diff --git a/lib/init-action.js b/lib/init-action.js
diff --git a/lib/init-action.js.map b/lib/init-action.js.map
diff --git a/lib/tracer-config.js b/lib/tracer-config.js
diff --git a/lib/tracer-config.js.map b/lib/tracer-config.js.map
diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js
diff --git a/lib/upload-sarif-action.js.map b/lib/upload-sarif-action.js.map
diff --git a/src/analyze-action.ts b/src/analyze-action.ts
@@ -102,7 +102,13 @@ async function run() {
   await sendStatusReport(startedAt, stats);
 }
 
-run().catch((e) => {
-  core.setFailed(`analyze action failed: ${e}`);
-  console.log(e);
-});
+async function runWrapper() {
+  try {
+    await run();
+  } catch (error) {
+    core.setFailed(`analyze action failed: ${error}`);
+    console.log(error);
+  }
+}
+
+void runWrapper();
diff --git a/src/autobuild-action.ts b/src/autobuild-action.ts
@@ -86,7 +86,13 @@ async function run() {
   await sendCompletedStatusReport(startedAt, language ? [language] : []);
 }
 
-run().catch((e) => {
-  core.setFailed(`autobuild action failed.  ${e}`);
-  console.log(e);
-});
+async function runWrapper() {
+  try {
+    await run();
+  } catch (error) {
+    core.setFailed(`autobuild action failed. ${error}`);
+    console.log(error);
+  }
+}
+
+void runWrapper();
diff --git a/src/init-action.ts b/src/init-action.ts
@@ -220,7 +220,13 @@ async function run() {
   await sendSuccessStatusReport(startedAt, config, toolsVersion);
 }
 
-run().catch((e) => {
-  core.setFailed(`init action failed: ${e}`);
-  console.log(e);
-});
+async function runWrapper() {
+  try {
+    await run();
+  } catch (error) {
+    core.setFailed(`init action failed: ${error}`);
+    console.log(error);
+  }
+}
+
+void runWrapper();
diff --git a/src/tracer-config.ts b/src/tracer-config.ts
@@ -133,7 +133,7 @@ export function concatTracerConfigs(
   for (const e of Object.entries(env)) {
     const key = e[0];
     const value = e[1];
-    const lineBuffer = new Buffer(`${key}=${value}\0`, "utf8");
+    const lineBuffer = Buffer.from(`${key}=${value}\0`, "utf8");
     const sizeBuffer = Buffer.alloc(4);
     sizeBuffer.writeInt32LE(lineBuffer.length, 0);
     buffer = Buffer.concat([buffer, sizeBuffer, lineBuffer]);

diff --git a/src/upload-sarif-action.ts b/src/upload-sarif-action.ts
@@ -76,7 +76,13 @@ async function run() {
   }
 }
 
-run().catch((e) => {
-  core.setFailed(`codeql/upload-sarif action failed: ${e}`);
-  console.log(e);
-});
+async function runWrapper() {
+  try {
+    await run();
+  } catch (error) {
+    core.setFailed(`codeql/upload-sarif action failed: ${error}`);
+    console.log(error);
+  }
+}
+
+void runWrapper();