Merge v2 into v1

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CodeQL Action Changelog
 
+## 1.1.8 - 08 Apr 2022
+
+- Update default CodeQL bundle version to 2.8.5. [#1014](https://github.com/github/codeql-action/pull/1014)
+- Fix error where the init action would fail due to a GitHub API request that was taking too long to complete [#1025](https://github.com/github/codeql-action/pull/1025)
+
 ## 1.1.7 - 05 Apr 2022
 
 - A bug where additional queries specified in the workflow file would sometimes not be respected has been fixed. [#1018](https://github.com/github/codeql-action/pull/1018)

lib/defaults.json

@@ -1,3 +1,3 @@
 {
-    "bundleVersion": "codeql-bundle-20220322"
+    "bundleVersion": "codeql-bundle-20220401"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "private": true,
   "description": "CodeQL action",
   "scripts": {

src/actions-util.ts

@@ -424,7 +424,7 @@ async function getWorkflowPath(): Promise<string> {
 
   const apiClient = api.getActionsApiClient();
   const runsResponse = await apiClient.request(
-    "GET /repos/:owner/:repo/actions/runs/:run_id",
+    "GET /repos/:owner/:repo/actions/runs/:run_id?exclude_pull_requests=true",
     {
       owner,
       repo,

src/defaults.json

@@ -1,3 +1,3 @@
 {
-  "bundleVersion": "codeql-bundle-20220322"
+  "bundleVersion": "codeql-bundle-20220401"
 }