Apply suggestions from code review

Co-authored-by: Henry Mercer <henry.mercer@me.com>
github · Jun 13, 2023 · 8e75e1a · 8e75e1a
1 parent ef4bf4a
commit 8e75e1a
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/__resolve-environment-action.yml b/.github/workflows/__resolve-environment-action.yml
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js
diff --git a/lib/resolve-environment-action.js.map b/lib/resolve-environment-action.js.map
diff --git a/lib/resolve-environment.js b/lib/resolve-environment.js
diff --git a/pr-checks/checks/resolve-environment-action.yml b/pr-checks/checks/resolve-environment-action.yml
@@ -1,4 +1,4 @@
-name: "resolve-environment-action"
+name: "Resolve environment"
 description: "Tests that the resolve-environment action works for Go"
 versions: ["nightly-latest"]
 steps:

diff --git a/src/codeql.ts b/src/codeql.ts
@@ -239,7 +239,6 @@ export interface ResolveQueriesOutput {
 export interface ResolveBuildEnvironmentOutput {
   configuration?: {
     [language: string]: {
-      os?: unknown;
       [key: string]: unknown;
     };
   };

diff --git a/src/resolve-environment-action.ts b/src/resolve-environment-action.ts
@@ -2,6 +2,7 @@ import * as core from "@actions/core";
 
 import {
   createStatusReportBase,
+  getActionsStatus,
   getOptionalInput,
   getRequiredInput,
   getTemporaryDirectory,
@@ -58,11 +59,13 @@ async function run() {
     core.setOutput("environment", result);
   } catch (unwrappedError) {
     const error = wrapError(unwrappedError);
-    core.setFailed(error.message);
+    core.setFailed(
+      `Failed to resolve a build environment suitable for automatically building your code. ${error.message}`
+    );
     await sendStatusReport(
       await createStatusReportBase(
         ACTION_NAME,
-        "aborted",
+        getActionsStatus(error),
         startedAt,
         error.message,
         error.stack

diff --git a/src/resolve-environment.ts b/src/resolve-environment.ts
@@ -11,8 +11,8 @@ export async function runResolveBuildEnvironment(
   logger.startGroup(
     `Attempting to resolve build environment for ${language} in ${workingDir}`
   );
-  const codeQL = await getCodeQL(cmd);
-  const result = await codeQL.resolveBuildEnvironment(workingDir, language);
+  const codeql = await getCodeQL(cmd);
+  const result = await codeql.resolveBuildEnvironment(workingDir, language);
   logger.endGroup();
   return result;
 }