Merge branch 'main' into henrymercer/simplify-actions-only

github · Jul 8, 2024 · a98055b · a98055b
2 parents a0041ad + 064a406
commit a98055b
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 58 deletions.
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/analyze.js b/lib/analyze.js
diff --git a/lib/analyze.js.map b/lib/analyze.js.map
diff --git a/lib/cli-errors.js b/lib/cli-errors.js
diff --git a/lib/cli-errors.js.map b/lib/cli-errors.js.map
diff --git a/lib/codeql.test.js b/lib/codeql.test.js
diff --git a/lib/codeql.test.js.map b/lib/codeql.test.js.map
diff --git a/src/analyze-action.ts b/src/analyze-action.ts
@@ -357,33 +357,19 @@ async function run() {
       core.setFailed(error.message);
     }
 
-    if (error instanceof CodeQLAnalysisError) {
-      const stats = { ...error.queriesStatusReport };
-      await sendStatusReport(
-        startedAt,
-        config,
-        stats,
-        error,
-        trapCacheUploadTime,
-        dbCreationTimings,
-        didUploadTrapCaches,
-        trapCacheCleanupTelemetry,
-        logger,
-      );
-    } else {
-      await sendStatusReport(
-        startedAt,
-        config,
-        undefined,
-        error,
-        trapCacheUploadTime,
-        dbCreationTimings,
-        didUploadTrapCaches,
-        trapCacheCleanupTelemetry,
-        logger,
-      );
-    }
-
+    await sendStatusReport(
+      startedAt,
+      config,
+      error instanceof CodeQLAnalysisError
+        ? error.queriesStatusReport
+        : undefined,
+      error instanceof CodeQLAnalysisError ? error.error : error,
+      trapCacheUploadTime,
+      dbCreationTimings,
+      didUploadTrapCaches,
+      trapCacheCleanupTelemetry,
+      logger,
+    );
     return;
   }