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

Always upload DB when in debug mode

.github/prepare-test/action.yml

@@ -28,7 +28,6 @@ runs:
           echo "::set-output name=tools-url::https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/codeql-bundle-$VERSION-manual/codeql-bundle.tar.gz"
         elif [[ ${{ inputs.version }} == *"stable"* ]]; then
           export VERSION=`echo ${{ inputs.version }} | sed -e 's/^.*\-//'`
-          echo "Hello $VERSION"
           echo "::set-output name=tools-url::https://github.com/github/codeql-action/releases/download/codeql-bundle-$VERSION/codeql-bundle.tar.gz"
         elif [[ ${{ inputs.version }} == "latest" ]]; then
           echo "::set-output name=tools-url::latest"

lib/analyze-action.js

@@ -120,13 +120,6 @@ async function run() {
             actionsUtil.getRequiredInput("wait-for-processing") === "true") {
             await upload_lib.waitForProcessing((0, repository_1.parseRepositoryNwo)(util.getRequiredEnvParam("GITHUB_REPOSITORY")), uploadResult.sarifID, apiDetails, (0, logging_1.getActionsLogger)());
         }
-        if (config.debugMode) {
-            // Upload the database bundles as an Actions artifact for debugging
-            const toUpload = [];
-            for (const language of config.languages)
-                toUpload.push(await (0, util_1.bundleDb)(config, language, codeql));
-            await uploadDebugArtifacts(toUpload, config.dbLocation);
-        }
     }
     catch (origError) {
         const error = origError instanceof Error ? origError : new Error(String(origError));
@@ -142,6 +135,19 @@ async function run() {
         return;
     }
     finally {
+        if (config !== undefined && config.debugMode) {
+            try {
+                // Upload the database bundles as an Actions artifact for debugging
+                const toUpload = [];
+                for (const language of config.languages) {
+                    toUpload.push(await (0, util_1.bundleDb)(config, language, await (0, codeql_1.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) {

lib/api-compatibility.json

@@ -1 +1 @@
-{ "maximumVersion": "3.3", "minimumVersion": "3.0" }
+{ "maximumVersion": "3.4", "minimumVersion": "3.0" }

python-setup/install_tools.ps1

@@ -5,9 +5,9 @@ py -3 -m pip install --user --upgrade pip setuptools wheel
 
 # virtualenv is a bit nicer for setting up virtual environment, since it will provide up-to-date versions of
 # pip/setuptools/wheel which basic `python3 -m venv venv` won't
-py -2 -m pip install --user virtualenv
-py -3 -m pip install --user virtualenv
+py -2 -m pip install --user 'virtualenv<20.11'
+py -3 -m pip install --user 'virtualenv<20.11'
 
 # poetry 1.0.10 has error (https://github.com/python-poetry/poetry/issues/2711)
 py -3 -m pip install --user poetry!=1.0.10
-py -3 -m pip install --user pipenv
+py -3 -m pip install --user pipenv

python-setup/install_tools.sh

@@ -15,7 +15,7 @@ python3 -m pip install --user --upgrade pip setuptools wheel
 
 # virtualenv is a bit nicer for setting up virtual environment, since it will provide up-to-date versions of
 # pip/setuptools/wheel which basic `python3 -m venv venv` won't
-python3 -m pip install --user virtualenv
+python3 -m pip install --user 'virtualenv<20.11'
 
 # We install poetry with pip instead of the recommended way, since the recommended way
 # caused some problem since `poetry run` gives output like:
@@ -35,5 +35,5 @@ if command -v python2 &> /dev/null; then
 
 	python2 -m pip install --user --upgrade pip setuptools wheel
 
-	python2 -m pip install --user virtualenv
+	python2 -m pip install --user 'virtualenv<20.11'
 fi

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) {

src/api-compatibility.json

@@ -1 +1 @@
-{"maximumVersion": "3.3", "minimumVersion": "3.0"}
+{"maximumVersion": "3.4", "minimumVersion": "3.0"}