Merge branch 'main' into duplicated-output

github · Dec 13, 2021 · 1d83f2a · 1d83f2a
2 parents b7b7607 + ce77f88
commit 1d83f2a
Showing 12 changed files with 36 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [UNRELEASED]
 
+No user facing changes.
+
+## 1.0.26 - 10 Dec 2021
+
 - Update default CodeQL bundle version to 2.7.3. [#842](https://github.com/github/codeql-action/pull/842)
 
 ## 1.0.25 - 06 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/util.js b/lib/util.js
diff --git a/lib/util.js.map b/lib/util.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.26",
+  "version": "1.0.27",
   "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.26",
+  "version": "1.0.27",
   "private": true,
   "description": "CodeQL runner",
   "scripts": {

diff --git a/src/codeql.ts b/src/codeql.ts
@@ -17,6 +17,7 @@ import { Logger } from "./logging";
 import * as toolcache from "./toolcache";
 import { toolrunnerErrorCatcher } from "./toolrunner-error-catcher";
 import * as util from "./util";
+import { isGoodVersion } from "./util";
 
 type Options = Array<string | number | boolean>;
 
@@ -403,7 +404,7 @@ export async function setupCodeQL(
           toolCacheDir,
           logger
         );
-        if (codeqlVersions.length === 1) {
+        if (codeqlVersions.length === 1 && isGoodVersion(codeqlVersions[0])) {
           const tmpCodeqlFolder = toolcache.find(
             "CodeQL",
             codeqlVersions[0],

diff --git a/src/util.ts b/src/util.ts
@@ -14,6 +14,12 @@ import { Config } from "./config-utils";
 import { Language } from "./languages";
 import { Logger } from "./logging";
 
+/**
+ * Specifies bundle versions that are known to be broken
+ * and will not be used if found in the toolcache.
+ */
+const BROKEN_VERSIONS = ["0.0.0-20211207"];
+
 /**
  * The URL for github.com.
  */
@@ -575,3 +581,7 @@ export async function bundleDb(
 export async function delay(milliseconds: number) {
   return new Promise((resolve) => setTimeout(resolve, milliseconds));
 }
+
+export function isGoodVersion(versionSpec: string) {
+  return !BROKEN_VERSIONS.includes(versionSpec);
+}