Fix upload-sarif not uploading non-.sarif files

Author: mbg

lib/upload-sarif-action.js

@@ -52,6 +52,7 @@ async function findAndUpload(
   pathStats: fs.Stats,
   checkoutPath: string,
   analysis: analyses.AnalysisConfig,
+  sarifPredicate: (name: string) => boolean,
   category?: string,
 ): Promise<upload_lib.UploadResult | undefined> {
   let sarifFiles: string[] | undefined;
@@ -61,7 +62,7 @@ async function findAndUpload(
       sarifPath,
       analysis.sarifPredicate,
     );
-  } else if (pathStats.isFile() && analysis.sarifPredicate(sarifPath)) {
+  } else if (pathStats.isFile() && sarifPredicate(sarifPath)) {
     sarifFiles = [sarifPath];
   } else {
     return undefined;
@@ -153,6 +154,8 @@ async function run() {
       pathStats,
       checkoutPath,
       analyses.CodeScanning,
+      // Upload anything to Code Scanning that is not intended for Code Quality.
+      (name) => !analyses.CodeQuality.sarifPredicate(name),
       category,
     );
     if (uploadResult !== undefined) {
@@ -171,6 +174,7 @@ async function run() {
       pathStats,
       checkoutPath,
       analyses.CodeQuality,
+      analyses.CodeQuality.sarifPredicate,
       actionsUtil.fixCodeQualityCategory(logger, category),
     );
     if (qualityUploadResult !== undefined) {