Merge branch 'main' into add-codeql-version

CHANGELOG.md

@@ -6,8 +6,13 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the
 
 ## [UNRELEASED]
 
+No user facing changes.
+
+## 3.25.12 - 12 Jul 2024
+
 - Improve the reliability and performance of analyzing code when analyzing a compiled language with the `autobuild` [build mode](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#codeql-build-modes) on GitHub Enterprise Server. This feature is already available to GitHub.com users. [#2353](https://github.com/github/codeql-action/pull/2353)
 - Add `codeql-version` to outputs. [#2368](https://github.com/github/codeql-action/pull/2368)
+- Update default CodeQL bundle version to 2.18.0. [#2364](https://github.com/github/codeql-action/pull/2364)
 
 ## 3.25.11 - 28 Jun 2024
 

lib/defaults.json

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