Merge pull request #1942 from github/update-v2.22.2-8a2cbabd4

Merge main into releases/v2
github · Oct 12, 2023 · d90b8d7 · d90b8d7
2 parents fdcae64 + 175f696
commit d90b8d7
Show file tree

Hide file tree

Showing 57 changed files with 2,128 additions and 833 deletions.
diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml
diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs.
 
+## 2.22.2 - 12 Oct 2023
+
+- Update default CodeQL bundle version to 2.15.0. [#1938](https://github.com/github/codeql-action/pull/1938)
+- Improve the log output when an error occurs in an invocation of the CodeQL CLI. [#1927](https://github.com/github/codeql-action/pull/1927)
+
 ## 2.22.1 - 09 Oct 2023
 
 - Add a workaround for Python 3.12, which is not supported in CodeQL CLI version 2.14.6 or earlier. If you are running an analysis on Windows and using Python 3.12 or later, the CodeQL Action will switch to running Python 3.11. In this case, if Python 3.11 is not found, then the workflow will fail. [#1928](https://github.com/github/codeql-action/pull/1928)

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/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/codeql.test.js b/lib/codeql.test.js
diff --git a/lib/codeql.test.js.map b/lib/codeql.test.js.map
diff --git a/lib/defaults.json b/lib/defaults.json
@@ -1,6 +1,6 @@
 {
-    "bundleVersion": "codeql-bundle-v2.14.6",
-    "cliVersion": "2.14.6",
-    "priorBundleVersion": "codeql-bundle-v2.14.5",
-    "priorCliVersion": "2.14.5"
+    "bundleVersion": "codeql-bundle-v2.15.0",
+    "cliVersion": "2.15.0",
+    "priorBundleVersion": "codeql-bundle-v2.14.6",
+    "priorCliVersion": "2.14.6"
 }
diff --git a/lib/feature-flags.js b/lib/feature-flags.js