Merge branch 'main' into henrymercer/handle-merge-conflicts-in-releases

henrymercer · web-flow · commit d2d14adf3ece · 2022-04-26T10:03:00.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
 
diff --git a/lib/defaults.json b/lib/defaults.json
@@ -1,3 +1,3 @@
 {
-    "bundleVersion": "codeql-bundle-20220401"
+    "bundleVersion": "codeql-bundle-20220421"
 }
diff --git a/src/defaults.json b/src/defaults.json
@@ -1,3 +1,3 @@
 {
-  "bundleVersion": "codeql-bundle-20220401"
+  "bundleVersion": "codeql-bundle-20220421"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "bundleVersion": "codeql-bundle-20220401"`
	`2`	`+ "bundleVersion": "codeql-bundle-20220421"`
`3`	`3`	`}`