Merge pull request #673 from github/update-v1.0.10-fa18c606

Merge main into v1
github · Aug 3, 2021 · a00769b · a00769b
2 parents 33f3438 + 6e07237
commit a00769b
Show file tree

Hide file tree

Showing 17 changed files with 96 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CodeQL Action and CodeQL Runner Changelog
 
+## 1.0.10 - 03 Aug 2021
+
+- Fix an issue where a summary of diagnostics information from CodeQL was not output to the logs of the `analyze` step of the Action. [#672](https://github.com/github/codeql-action/pull/672)
+
 ## 1.0.9 - 02 Aug 2021
 
 No user facing changes.

diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/node_modules/eslint/CHANGELOG.md b/node_modules/eslint/CHANGELOG.md
diff --git a/node_modules/eslint/README.md b/node_modules/eslint/README.md
diff --git a/node_modules/eslint/lib/cli-engine/cli-engine.js b/node_modules/eslint/lib/cli-engine/cli-engine.js
diff --git a/node_modules/eslint/lib/cli.js b/node_modules/eslint/lib/cli.js
diff --git a/node_modules/eslint/lib/options.js b/node_modules/eslint/lib/options.js
diff --git a/node_modules/eslint/lib/rules/comma-style.js b/node_modules/eslint/lib/rules/comma-style.js
diff --git a/node_modules/eslint/lib/rules/curly.js b/node_modules/eslint/lib/rules/curly.js
diff --git a/node_modules/eslint/package.json b/node_modules/eslint/package.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.9",
+  "version": "1.0.10",
   "private": true,
   "description": "CodeQL action",
   "scripts": {
@@ -61,7 +61,7 @@
     "@types/sinon": "^10.0.2",
     "@typescript-eslint/parser": "^4.1.0",
     "ava": "3.8.1",
-    "eslint": "^7.9.0",
+    "eslint": "^7.32.0",
     "eslint-plugin-filenames": "^1.3.2",
     "eslint-plugin-github": "^4.1.5",
     "eslint-plugin-import": "^2.22.0",

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.9",
+  "version": "1.0.10",
   "private": true,
   "description": "CodeQL runner",
   "scripts": {
@@ -11,7 +11,7 @@
   "devDependencies": {
     "pkg": "^5.3.1",
     "ts-loader": "9.2.4",
-    "webpack": "^5.47.0",
+    "webpack": "^5.47.1",
     "webpack-cli": "^4.7.2"
   }
 }
diff --git a/src/codeql.ts b/src/codeql.ts
@@ -754,6 +754,7 @@ function getCodeQLForCmd(cmd: string): CodeQL {
         "interpret-results",
         threadsFlag,
         "--format=sarif-latest",
+        "--print-diagnostics-summary",
         "--print-metrics-summary",
         "--sarif-group-rules-by-pack",
         "-v",