Skip to content

Commit

Permalink
Merge branch 'main' into henrymercer/handle-merge-conflicts-in-releases
Browse files Browse the repository at this point in the history
  • Loading branch information
henrymercer committed Apr 26, 2022
2 parents 2b8fdb3 + 95b49c3 commit d2d14ad
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -4,6 +4,7 @@

- Add `working-directory` input to the `autobuild` action. [#1024](https://github.com/github/codeql-action/pull/1024)
- The `analyze` and `upload-sarif` actions will now wait up to 2 minutes for processing to complete after they have uploaded the results so they can report any processing errors that occurred. This behavior can be disabled by setting the `wait-for-processing` action input to `"false"`. [#1007](https://github.com/github/codeql-action/pull/1007)
- Update default CodeQL bundle version to 2.9.0.

## 2.1.8 - 08 Apr 2022

Expand Down
2 changes: 1 addition & 1 deletion lib/defaults.json
@@ -1,3 +1,3 @@
{
"bundleVersion": "codeql-bundle-20220401"
"bundleVersion": "codeql-bundle-20220421"
}
2 changes: 1 addition & 1 deletion src/defaults.json
@@ -1,3 +1,3 @@
{
"bundleVersion": "codeql-bundle-20220401"
"bundleVersion": "codeql-bundle-20220421"
}

0 comments on commit d2d14ad

Please sign in to comment.