Merge pull request #2433 from github/backport-v2.26.3-883d8588e

Merge releases/v3 into releases/v2
github · Aug 19, 2024 · d65d0c9 · d65d0c9
2 parents 366883a + 0408560
commit d65d0c9
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
 
 Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. For example `3.22.11` was the first `v3` release and is functionally identical to `2.22.11`. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers.
 
+## 2.26.3 - 19 Aug 2024
+
+- Fix an issue where the CodeQL Action could not write diagnostic messages on Windows. This issue did not impact analysis quality. [#2430](https://github.com/github/codeql-action/pull/2430)
+
 ## 2.26.2 - 14 Aug 2024
 
 - Update default CodeQL bundle version to 2.18.2. [#2417](https://github.com/github/codeql-action/pull/2417)

diff --git a/lib/diagnostics.js b/lib/diagnostics.js
diff --git a/lib/diagnostics.js.map b/lib/diagnostics.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.26.2",
+  "version": "2.26.3",
   "private": true,
   "description": "CodeQL action",
   "scripts": {

diff --git a/src/diagnostics.ts b/src/diagnostics.ts
@@ -145,7 +145,8 @@ function writeDiagnostic(
 
     const jsonPath = path.resolve(
       diagnosticsPath,
-      `codeql-action-${diagnostic.timestamp}.json`,
+      // Remove colons from the timestamp as these are not allowed in Windows filenames.
+      `codeql-action-${diagnostic.timestamp.replaceAll(":", "")}.json`,
     );
 
     writeFileSync(jsonPath, JSON.stringify(diagnostic));