Merge main into releases/v3

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.
 
+## 3.25.15 - 26 Jul 2024
+
+- Update default CodeQL bundle version to 2.18.1. [#2385](https://github.com/github/codeql-action/pull/2385)
+
 ## 3.25.14 - 25 Jul 2024
 
 - Experimental: add a new `start-proxy` action which starts the same HTTP proxy as used by [`github/dependabot-action`](https://github.com/github/dependabot-action). Do not use this in production as it is part of an internal experiment and subject to change at any time.

lib/defaults.json

@@ -1,6 +1,6 @@
 {
-    "bundleVersion": "codeql-bundle-v2.18.0",
-    "cliVersion": "2.18.0",
-    "priorBundleVersion": "codeql-bundle-v2.17.6",
-    "priorCliVersion": "2.17.6"
+    "bundleVersion": "codeql-bundle-v2.18.1",
+    "cliVersion": "2.18.1",
+    "priorBundleVersion": "codeql-bundle-v2.18.0",
+    "priorCliVersion": "2.18.0"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "3.25.14",
+  "version": "3.25.15",
   "private": true,
   "description": "CodeQL action",
   "scripts": {

src/defaults.json

@@ -1,6 +1,6 @@
 {
-  "bundleVersion": "codeql-bundle-v2.18.0",
-  "cliVersion": "2.18.0",
-  "priorBundleVersion": "codeql-bundle-v2.17.6",
-  "priorCliVersion": "2.17.6"
+  "bundleVersion": "codeql-bundle-v2.18.1",
+  "cliVersion": "2.18.1",
+  "priorBundleVersion": "codeql-bundle-v2.18.0",
+  "priorCliVersion": "2.18.0"
 }