Merge branch 'main' into update-bundle/codeql-bundle-v2.14.1

.git-blame-ignore-revs

@@ -0,0 +1,3 @@
+# .git-blame-ignore-revs
+# Added trailing commas to adhere to new eslint rules
+b16296be30e150034524d6dd0b0418fc6b184267

.github/dependabot.yml

@@ -11,9 +11,6 @@ updates:
       # There is a type incompatibility issue between v0.0.9 and our other dependencies.
       - dependency-name: "@octokit/plugin-retry"
         versions: ["~6.0.0"]
-      # There is a type incompatibility issue between v0.0.9 and our other dependencies.
-      - dependency-name: "@schemastore/package"
-        versions: ["0.0.9"]
       # v7 requires ESM
       - dependency-name: "del"
         versions: ["^7.0.0"]

CHANGELOG.md

@@ -6,6 +6,11 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
 
 - Update default CodeQL bundle version to 2.14.1. [#1797](https://github.com/github/codeql-action/pull/1797)
 
+## 2.21.1 - 26 Jul 2023
+
+- Improve the handling of fatal errors from the CodeQL CLI. [#1795](https://github.com/github/codeql-action/pull/1795)
+- Add the `sarif-output` output to the analyze action that contains the path to the directory of the generated SARIF. [#1799](https://github.com/github/codeql-action/pull/1799)
+
 ## 2.21.0 - 19 Jul 2023
 
 - CodeQL Action now requires CodeQL CLI 2.9.4 or later. For more information, see the corresponding changelog entry for CodeQL Action version 2.20.4. [#1724](https://github.com/github/codeql-action/pull/1724)

analyze/action.yml

@@ -79,6 +79,8 @@ inputs:
 outputs:
   db-locations:
     description: A map from language to absolute path for each database created by CodeQL.
+  sarif-output:
+    description: Absolute, local path to the directory containing the generated SARIF file.
   sarif-id:
     description: The ID of the uploaded SARIF file.
 runs: