Merge pull request #2028 from github/update-v2.22.10-fe23b5a3e

cklin · web-flow · commit 305f6546310b · 2023-12-12T08:56:03.000-08:00
Merge main into releases/v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs.
 
+## 2.22.10 - 12 Dec 2023
+
+- Update default CodeQL bundle version to 2.15.4. [#2016](https://github.com/github/codeql-action/pull/2016)
+
 ## 2.22.9 - 07 Dec 2023
 
 No user facing changes.
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/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.22.9",
+  "version": "2.22.10",
   "private": true,
   "description": "CodeQL action",
   "scripts": {
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`	`}`