Merge branch 'main' into henrymercer/prompt-v1-to-v2-upgrades

github · Apr 28, 2022 · 2bf00f7 · 2bf00f7
2 parents 02083c3 + 6ed7f70
commit 2bf00f7
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,14 @@
 
 ## [UNRELEASED]
 
+No user facing changes.
+
+## 2.1.9 - 27 Apr 2022
+
 - Add `working-directory` input to the `autobuild` action. [#1024](https://github.com/github/codeql-action/pull/1024)
 - 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"`. [#1007](https://github.com/github/codeql-action/pull/1007)
 - Update default CodeQL bundle version to 2.9.0.
+- Fix a bug where [status reporting fails on Windows](https://github.com/github/codeql-action/issues/1041). [#1042](https://github.com/github/codeql-action/pull/1042)
 
 ## 2.1.8 - 08 Apr 2022
 

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": "2.1.9",
+  "version": "2.1.10",
   "private": true,
   "description": "CodeQL action",
   "scripts": {

diff --git a/src/codeql.ts b/src/codeql.ts
@@ -641,7 +641,7 @@ async function getCodeQLForCmd(
     async getVersion() {
       let result = util.getCachedCodeQlVersion();
       if (result === undefined) {
-        result = await runTool(cmd, ["version", "--format=terse"]);
+        result = (await runTool(cmd, ["version", "--format=terse"])).trim();
         util.cacheCodeQlVersion(result);
       }
       return result;