Merge pull request #2630 from github/backport-v2.27.6-aa5781025

Merge releases/v3 into releases/v2
github · Dec 3, 2024 · 82a3f64 · 82a3f64
2 parents e2b57b0 + 0d39235
commit 82a3f64
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 17 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.27.6 - 03 Dec 2024
+
+- Update default CodeQL bundle version to 2.19.4. [#2626](https://github.com/github/codeql-action/pull/2626)
+
 ## 2.27.5 - 19 Nov 2024
 
 No user facing changes.

diff --git a/lib/analyze.js b/lib/analyze.js
diff --git a/lib/analyze.js.map b/lib/analyze.js.map
diff --git a/lib/api-compatibility.json b/lib/api-compatibility.json
@@ -1 +1 @@
-{ "maximumVersion": "3.15", "minimumVersion": "3.11" }
+{ "maximumVersion": "3.16", "minimumVersion": "3.11" }
diff --git a/lib/defaults.json b/lib/defaults.json
@@ -1,6 +1,6 @@
 {
-    "bundleVersion": "codeql-bundle-v2.19.3",
-    "cliVersion": "2.19.3",
-    "priorBundleVersion": "codeql-bundle-v2.19.2",
-    "priorCliVersion": "2.19.2"
+    "bundleVersion": "codeql-bundle-v2.19.4",
+    "cliVersion": "2.19.4",
+    "priorBundleVersion": "codeql-bundle-v2.19.3",
+    "priorCliVersion": "2.19.3"
 }
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.27.5",
+  "version": "2.27.6",
   "private": true,
   "description": "CodeQL action",
   "scripts": {

diff --git a/src/analyze.ts b/src/analyze.ts
@@ -428,7 +428,10 @@ extensions:
 `;
 
   let data = ranges
-    .map((range) => `      - ["${range[0]}", ${range[1]}, ${range[2]}]\n`)
+    .map(
+      (range) =>
+        `      - ["${range.path}", ${range.startLine}, ${range.endLine}]\n`,
+    )
     .join("");
   if (!data) {
     // Ensure that the data extension is not empty, so that a pull request with

diff --git a/src/api-compatibility.json b/src/api-compatibility.json
@@ -1 +1 @@
-{"maximumVersion": "3.15", "minimumVersion": "3.11"}
+{"maximumVersion": "3.16", "minimumVersion": "3.11"}
diff --git a/src/defaults.json b/src/defaults.json
@@ -1,6 +1,6 @@
 {
-  "bundleVersion": "codeql-bundle-v2.19.3",
-  "cliVersion": "2.19.3",
-  "priorBundleVersion": "codeql-bundle-v2.19.2",
-  "priorCliVersion": "2.19.2"
+  "bundleVersion": "codeql-bundle-v2.19.4",
+  "cliVersion": "2.19.4",
+  "priorBundleVersion": "codeql-bundle-v2.19.3",
+  "priorCliVersion": "2.19.3"
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{ "maximumVersion": "3.15", "minimumVersion": "3.11" }
		{ "maximumVersion": "3.16", "minimumVersion": "3.11" }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"maximumVersion": "3.15", "minimumVersion": "3.11"}
		{"maximumVersion": "3.16", "minimumVersion": "3.11"}