Merge pull request #767 from github/update-v1.0.18-0bbf22e3

Merge main into v1
github · Oct 8, 2021 · fd3190b · fd3190b
2 parents 03e7dda + 4a45fbe
commit fd3190b
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CodeQL Action and CodeQL Runner Changelog
 
+## 1.0.18 - 08 Oct 2021
+
+- Fixed a bug where some builds were no longer being traced correctly. [#766](https://github.com/github/codeql-action/pull/766)
+
 ## 1.0.17 - 07 Oct 2021
 
 - Update default CodeQL bundle version to 2.6.3. [#761](https://github.com/github/codeql-action/pull/761)

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/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.17",
+  "version": "1.0.18",
   "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.17",
+  "version": "1.0.18",
   "private": true,
   "description": "CodeQL runner",
   "scripts": {

diff --git a/src/codeql.ts b/src/codeql.ts
@@ -212,9 +212,25 @@ const CODEQL_VERSION_DIAGNOSTICS = "2.5.6";
 const CODEQL_VERSION_METRICS = "2.5.5";
 const CODEQL_VERSION_GROUP_RULES = "2.5.5";
 const CODEQL_VERSION_SARIF_GROUP = "2.5.3";
-export const CODEQL_VERSION_NEW_TRACING = "2.6.0"; // Use multi-language (>= 2.5.6) and indirect (>= 2.6.0) tracing.
 export const CODEQL_VERSION_COUNTS_LINES = "2.6.2";
 
+/**
+ * Version above which we use the CLI's indirect build tracing and
+ * multi-language tracing features.
+ *
+ * There are currently three blockers on the CLI's side to enabling this:
+ * (1) The logs directory should be created for a DB cluster, as some
+ *     autobuilders expect it to be present.
+ * (2) The SEMMLE_PRELOAD_libtrace{32,64}? env variables need to be set.
+ * (3) The .environment and .win32env files need to be created next to
+ *     the DB spec.
+ *
+ * Once _all_ of these are fixed, we can enable this by setting the
+ * version flag below to the earliest version of the CLI that resolved
+ * the above issues.
+ */
+export const CODEQL_VERSION_NEW_TRACING = "99.99.99";
+
 function getCodeQLBundleName(): string {
   let platform: string;
   if (process.platform === "win32") {