Merge branch 'main' into fix-typos

github · Nov 20, 2020 · 6ed5c82 · 6ed5c82
2 parents 82ba92f + 6d232b4
commit 6ed5c82
Show file tree

Hide file tree

Showing 20 changed files with 113 additions and 82 deletions.
diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py
@@ -123,8 +123,8 @@ def get_pr_for_commit(repo, commit):
   if prs.totalCount > 0:
     # In the case that there are multiple PRs, return the earliest one
     prs = list(prs)
-    sorted(prs, key=lambda pr: int(pr.number))
-    return prs[0]
+    sorted_prs = sorted(prs, key=lambda pr: int(pr.number))
+    return sorted_prs[0]
   else:
     return None
 

diff --git a/.github/workflows/integration-testing.yml b/.github/workflows/integration-testing.yml
@@ -466,6 +466,8 @@ jobs:
   runner-upload-sarif:
     runs-on: ubuntu-latest
 
+    if: ${{ github.event_name != 'pull_request' || github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id }}
+
     steps:
     - uses: actions/checkout@v2
 

diff --git a/lib/actions-util.js b/lib/actions-util.js
diff --git a/lib/actions-util.js.map b/lib/actions-util.js.map
diff --git a/lib/analyze-action.js b/lib/analyze-action.js