Merge pull request #883 from github/update-v1.0.30-a7adbce2

Merge main into v1
github · Jan 24, 2022 · 8b37404 · 8b37404
2 parents 384cfc4 + c180f23
commit 8b37404
Show file tree

Hide file tree

Showing 14 changed files with 86 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CodeQL Action and CodeQL Runner Changelog
 
+## 1.0.30 - 24 Jan 2022
+
+- Display a better error message when encountering a workflow that runs the `codeql-action/init` action multiple times. [#876](https://github.com/github/codeql-action/pull/876)
+- Update default CodeQL bundle version to 2.7.6. [#877](https://github.com/github/codeql-action/pull/877)
+
 ## 1.0.29 - 21 Jan 2022
 
 - The feature to wait for SARIF processing to complete after upload has been disabled by default due to a bug in its interaction with pull requests from forks.
@@ -11,7 +16,7 @@
 
 ## 1.0.27 - 11 Jan 2022
 
-- The `analyze` and `upload-sarif` actions will now wait up to 2 minutes for processing to complete after they have uploaded the results so they can report any processing errors that occurred. This behavior can be disabled by setting the `wait-for-processing` action input to `"false"`.
+- The `analyze` and `upload-sarif` actions will now wait up to 2 minutes for processing to complete after they have uploaded the results so they can report any processing errors that occurred. This behavior can be disabled by setting the `wait-for-processing` action input to `"false"`. [#855](https://github.com/github/codeql-action/pull/855)
 
 ## 1.0.26 - 10 Dec 2021
 

diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/defaults.json b/lib/defaults.json
@@ -1,3 +1,3 @@
 {
-    "bundleVersion": "codeql-bundle-20220112"
+    "bundleVersion": "codeql-bundle-20220120"
 }
diff --git a/lib/init.js b/lib/init.js
diff --git a/lib/init.js.map b/lib/init.js.map
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "private": true,
   "description": "CodeQL action",
   "scripts": {

diff --git a/runner/package-lock.json b/runner/package-lock.json
diff --git a/runner/package.json b/runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql-runner",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "private": true,
   "description": "CodeQL runner",
   "scripts": {

diff --git a/src/codeql.ts b/src/codeql.ts
@@ -805,7 +805,12 @@ async function getCodeQLForCmd(
       await toolrunnerErrorCatcher(cmd, args, errorMatchers);
     },
     async resolveLanguages() {
-      const codeqlArgs = ["resolve", "languages", "--format=json"];
+      const codeqlArgs = [
+        "resolve",
+        "languages",
+        "--format=json",
+        ...getExtraOptionsFromEnv(["resolve", "languages"]),
+      ];
       const output = await runTool(cmd, codeqlArgs);
 
       try {
@@ -956,6 +961,7 @@ async function getCodeQLForCmd(
         "cleanup",
         databasePath,
         `--mode=${cleanupLevel}`,
+        ...getExtraOptionsFromEnv(["database", "cleanup"]),
       ];
       await runTool(cmd, codeqlArgs);
     },
@@ -970,6 +976,7 @@ async function getCodeQLForCmd(
         databasePath,
         `--output=${outputFilePath}`,
         `--name=${databaseName}`,
+        ...getExtraOptionsFromEnv(["database", "bundle"]),
       ];
       await new toolrunner.ToolRunner(cmd, args).exec();
     },

diff --git a/src/defaults.json b/src/defaults.json
@@ -1,3 +1,3 @@
 {
-  "bundleVersion": "codeql-bundle-20220112"
+  "bundleVersion": "codeql-bundle-20220120"
 }
diff --git a/src/init.ts b/src/init.ts
@@ -91,26 +91,41 @@ export async function runInit(
 ): Promise<TracerConfig | undefined> {
   fs.mkdirSync(config.dbLocation, { recursive: true });
 
-  if (await codeQlVersionAbove(codeql, CODEQL_VERSION_NEW_TRACING)) {
-    // Init a database cluster
-    await codeql.databaseInitCluster(
-      config.dbLocation,
-      config.languages,
-      sourceRoot,
-      processName,
-      processLevel
-    );
-  } else {
-    for (const language of config.languages) {
-      // Init language database
-      await codeql.databaseInit(
-        util.getCodeQLDatabasePath(config, language),
-        language,
-        sourceRoot
+  try {
+    if (await codeQlVersionAbove(codeql, CODEQL_VERSION_NEW_TRACING)) {
+      // Init a database cluster
+      await codeql.databaseInitCluster(
+        config.dbLocation,
+        config.languages,
+        sourceRoot,
+        processName,
+        processLevel
+      );
+    } else {
+      for (const language of config.languages) {
+        // Init language database
+        await codeql.databaseInit(
+          util.getCodeQLDatabasePath(config, language),
+          language,
+          sourceRoot
+        );
+      }
+    }
+  } catch (e) {
+    // Handle the situation where init is called twice
+    // for the same database in the same job.
+    if (
+      e instanceof Error &&
+      e.message?.includes("Refusing to create databases") &&
+      e.message.includes("exists and is not an empty directory.")
+    ) {
+      throw new Error(
+        `Is the "init" action called twice in the same job? ${e.message}`
       );
+    } else {
+      throw e;
     }
   }
-
   return await getCombinedTracerConfig(config, codeql);
 }