Merge branch 'main' into nickfyson/node-20

nickfyson · web-flow · commit 1de8705f6b25 · 2023-12-12T13:01:04.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
 ## [UNRELEASED]
 
 - [v3+ only] The CodeQL Action now runs on Node.js v20. [#2006](https://github.com/github/codeql-action/pull/2006)
+- Update default CodeQL bundle version to 2.15.4. [#2016](https://github.com/github/codeql-action/pull/2016)
 
 ## 2.22.9 - 07 Dec 2023
 
diff --git a/lib/defaults.json b/lib/defaults.json
@@ -1,6 +1,6 @@
 {
-    "bundleVersion": "codeql-bundle-v2.15.3",
-    "cliVersion": "2.15.3",
-    "priorBundleVersion": "codeql-bundle-v2.15.2",
-    "priorCliVersion": "2.15.2"
+    "bundleVersion": "codeql-bundle-v2.15.4",
+    "cliVersion": "2.15.4",
+    "priorBundleVersion": "codeql-bundle-v2.15.3",
+    "priorCliVersion": "2.15.3"
 }
diff --git a/src/defaults.json b/src/defaults.json
@@ -1,6 +1,6 @@
 {
-  "bundleVersion": "codeql-bundle-v2.15.3",
-  "cliVersion": "2.15.3",
-  "priorBundleVersion": "codeql-bundle-v2.15.2",
-  "priorCliVersion": "2.15.2"
+  "bundleVersion": "codeql-bundle-v2.15.4",
+  "cliVersion": "2.15.4",
+  "priorBundleVersion": "codeql-bundle-v2.15.3",
+  "priorCliVersion": "2.15.3"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "bundleVersion": "codeql-bundle-v2.15.3",`
`3`		`- "cliVersion": "2.15.3",`
`4`		`- "priorBundleVersion": "codeql-bundle-v2.15.2",`
`5`		`- "priorCliVersion": "2.15.2"`
	`2`	`+ "bundleVersion": "codeql-bundle-v2.15.4",`
	`3`	`+ "cliVersion": "2.15.4",`
	`4`	`+ "priorBundleVersion": "codeql-bundle-v2.15.3",`
	`5`	`+ "priorCliVersion": "2.15.3"`
`6`	`6`	`}`