Merge pull request github#799 from github/update-v1.0.21-a53b8d0e

cklin · web-flow · commit e891551dd483 · 2021-10-28T14:18:14.000-07:00
Merge main into v1
diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml
@@ -35,5 +35,5 @@ jobs:
           git config --global user.name "github-actions[bot]"
           git add node_modules
           git commit -am "Update checked-in dependencies"
-          git push origin "$BRANCH"
+          git push origin "HEAD:$BRANCH"
         fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CodeQL Action and CodeQL Runner Changelog
 
+## 1.0.21 - 28 Oct 2021
+
+- Update default CodeQL bundle version to 2.7.0. [#795](https://github.com/github/codeql-action/pull/795)
+
 ## 1.0.20 - 25 Oct 2021
 
 No user facing changes.
diff --git a/lib/defaults.json b/lib/defaults.json
@@ -1,3 +1,3 @@
 {
-    "bundleVersion": "codeql-bundle-20211013"
+    "bundleVersion": "codeql-bundle-20211025"
 }
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "private": true,
   "description": "CodeQL action",
   "scripts": {
diff --git a/runner/package-lock.json b/runner/package-lock.json
diff --git a/runner/package.json b/runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql-runner",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "private": true,
   "description": "CodeQL runner",
   "scripts": {
diff --git a/src/defaults.json b/src/defaults.json
@@ -1,3 +1,3 @@
 {
-  "bundleVersion": "codeql-bundle-20211013"
+  "bundleVersion": "codeql-bundle-20211025"
 }
diff --git a/upload-sarif/action.yml b/upload-sarif/action.yml
@@ -3,7 +3,10 @@ description: 'Upload the analysis results'
 author: 'GitHub'
 inputs:
   sarif_file:
-    description: The SARIF file or directory of SARIF files to be uploaded. Each upload should contain a maximum of 1000 results, any additional results are ignored.
+    description: |
+      The SARIF file or directory of SARIF files to be uploaded to GitHub code scanning.
+      See https://docs.github.com/en/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github#uploading-a-code-scanning-analysis-with-github-actions
+      for information on the maximum number of results and maximum file size supported by code scanning. 
     required: false
     default: '../results'
   checkout_path:

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "bundleVersion": "codeql-bundle-20211013"`
	`2`	`+ "bundleVersion": "codeql-bundle-20211025"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "codeql",`
`3`		`- "version": "1.0.20",`
	`3`	`+ "version": "1.0.21",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "CodeQL action",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "codeql-runner",`
`3`		`- "version": "1.0.20",`
	`3`	`+ "version": "1.0.21",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "CodeQL runner",`
`6`	`6`	`"scripts": {`