Allow duplicate categories in the same validation step

A single SARIF file should be allowed to have duplicated
categories.

lib/upload-lib.js

@@ -333,10 +333,16 @@ function validateUniqueCategory(sarif) {
     var _a, _b, _c;
     // This check only works on actions as env vars don't persist between calls to the runner
     if (util.isActions()) {
+        // duplicate categories are allowed in the same sarif file
+        // but not across multiple sarif files
+        const categories = {};
         for (const run of sarif.runs) {
             const id = (_a = run === null || run === void 0 ? void 0 : run.automationDetails) === null || _a === void 0 ? void 0 : _a.id;
             const tool = (_c = (_b = run.tool) === null || _b === void 0 ? void 0 : _b.driver) === null || _c === void 0 ? void 0 : _c.name;
             const category = `${sanitize(id)}_${sanitize(tool)}`;
+            categories[category] = { id, tool };
+        }
+        for (const [category, { id, tool }] of Object.entries(categories)) {
             const sentinelEnvVar = `CODEQL_UPLOAD_SARIF_${category}`;
             if (process.env[sentinelEnvVar]) {
                 throw new Error("Aborting upload: only one run of the codeql/analyze or codeql/upload-sarif actions is allowed per job per tool/category. " +

lib/upload-lib.test.js

@@ -184,8 +184,10 @@ ava_1.default.beforeEach(() => {
 (0, ava_1.default)("validateUniqueCategory for multiple runs", (t) => {
     const sarif1 = createMockSarif("abc", "def");
     const sarif2 = createMockSarif("ghi", "jkl");
-    const multiSarif = { runs: [sarif1.runs[0], sarif2.runs[0]] };
+    // duplicate categories are allowed within the same sarif file
+    const multiSarif = { runs: [sarif1.runs[0], sarif1.runs[0], sarif2.runs[0]] };
     t.notThrows(() => uploadLib.validateUniqueCategory(multiSarif));
+    // should throw if there are duplicate categories in separate validations
     t.throws(() => uploadLib.validateUniqueCategory(sarif1));
     t.throws(() => uploadLib.validateUniqueCategory(sarif2));
 });

src/upload-lib.test.ts

@@ -310,8 +310,11 @@ test("validateUniqueCategory for multiple runs", (t) => {
   const sarif1 = createMockSarif("abc", "def");
   const sarif2 = createMockSarif("ghi", "jkl");
 
-  const multiSarif = { runs: [sarif1.runs[0], sarif2.runs[0]] };
+  // duplicate categories are allowed within the same sarif file
+  const multiSarif = { runs: [sarif1.runs[0], sarif1.runs[0], sarif2.runs[0]] };
   t.notThrows(() => uploadLib.validateUniqueCategory(multiSarif));
+
+  // should throw if there are duplicate categories in separate validations
   t.throws(() => uploadLib.validateUniqueCategory(sarif1));
   t.throws(() => uploadLib.validateUniqueCategory(sarif2));
 });

src/upload-lib.ts

@@ -485,10 +485,18 @@ export async function waitForProcessing(
 export function validateUniqueCategory(sarif: SarifFile): void {
   // This check only works on actions as env vars don't persist between calls to the runner
   if (util.isActions()) {
+    // duplicate categories are allowed in the same sarif file
+    // but not across multiple sarif files
+    const categories = {} as Record<string, { id?: string; tool?: string }>;
+
     for (const run of sarif.runs) {
       const id = run?.automationDetails?.id;
       const tool = run.tool?.driver?.name;
       const category = `${sanitize(id)}_${sanitize(tool)}`;
+      categories[category] = { id, tool };
+    }
+
+    for (const [category, { id, tool }] of Object.entries(categories)) {
       const sentinelEnvVar = `CODEQL_UPLOAD_SARIF_${category}`;
       if (process.env[sentinelEnvVar]) {
         throw new Error(