Merge pull request #860 from edoardopirovano/always-upload-db

Always upload DB when in debug mode
github · Jan 4, 2022 · 9763bdd · 9763bdd
2 parents e5d84de + 00d4d60
commit 9763bdd
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 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/src/analyze-action.ts b/src/analyze-action.ts
@@ -207,14 +207,6 @@ async function run() {
         getActionsLogger()
       );
     }
-
-    if (config.debugMode) {
-      // Upload the database bundles as an Actions artifact for debugging
-      const toUpload: string[] = [];
-      for (const language of config.languages)
-        toUpload.push(await bundleDb(config, language, codeql));
-      await uploadDebugArtifacts(toUpload, config.dbLocation);
-    }
   } catch (origError) {
     const error =
       origError instanceof Error ? origError : new Error(String(origError));
@@ -230,6 +222,21 @@ async function run() {
 
     return;
   } finally {
+    if (config !== undefined && config.debugMode) {
+      try {
+        // Upload the database bundles as an Actions artifact for debugging
+        const toUpload: string[] = [];
+        for (const language of config.languages) {
+          toUpload.push(
+            await bundleDb(config, language, await getCodeQL(config.codeQLCmd))
+          );
+        }
+        await uploadDebugArtifacts(toUpload, config.dbLocation);
+      } catch (error) {
+        console.log(`Failed to upload database debug bundles: ${error}`);
+      }
+    }
+
     if (core.isDebug() && config !== undefined) {
       core.info("Debug mode is on. Printing CodeQL debug logs...");
       for (const language of config.languages) {