Matrix over analysis-kinds in quality-queries check

Author: mbg

.github/workflows/__quality-queries.yml

@@ -1,6 +1,7 @@
 name: "Quality queries input"
 description: "Tests that queries specified in the quality-queries input are used."
 versions: ["linked", "nightly-latest"]
+analysisKinds: ["code-scanning", "code-quality", "code-scanning,code-quality"]
 env:
   CHECK_SCRIPT: |
     const fs = require('fs');
@@ -29,32 +30,36 @@ steps:
   - uses: ./../action/init
     with:
       languages: javascript
-      analysis-kinds: code-scanning,code-quality
+      analysis-kinds: ${{ matrix.analysis-kinds }}
       tools: ${{ steps.prepare-test.outputs.tools-url }}
   - uses: ./../action/analyze
     with:
       output: "${{ runner.temp }}/results"
       upload-database: false
   - name: Upload security SARIF
+    if: contains(matrix.analysis-kinds, 'code-scanning')
     uses: actions/upload-artifact@v4
     with:
       name: quality-queries-${{ matrix.os }}-${{ matrix.version }}.sarif.json
       path: "${{ runner.temp }}/results/javascript.sarif"
       retention-days: 7
   - name: Upload quality SARIF
+    if: contains(matrix.analysis-kinds, 'code-quality')
     uses: actions/upload-artifact@v4
     with:
       name: quality-queries-${{ matrix.os }}-${{ matrix.version }}.quality.sarif.json
       path: "${{ runner.temp }}/results/javascript.quality.sarif"
       retention-days: 7
   - name: Check quality query does not appear in security SARIF
+    if: contains(matrix.analysis-kinds, 'code-scanning')
     uses: actions/github-script@v7
     env:
       SARIF_PATH: "${{ runner.temp }}/results/javascript.sarif"
       EXPECT_PRESENT: "false"
     with:
       script: ${{ env.CHECK_SCRIPT }}
   - name: Check quality query appears in quality SARIF
+    if: contains(matrix.analysis-kinds, 'code-quality')
     uses: actions/github-script@v7
     env:
       SARIF_PATH: "${{ runner.temp }}/results/javascript.quality.sarif"

pr-checks/checks/quality-queries.yml

@@ -102,6 +102,18 @@ def writeHeader(checkStream):
         if checkSpecification.get('useAllPlatformBundle'):
             useAllPlatformBundle = checkSpecification['useAllPlatformBundle']
 
+
+    if 'analysisKinds' in checkSpecification:
+        newMatrix = []
+        for matrixInclude in matrix:
+            for analysisKind in checkSpecification.get('analysisKinds'):
+                newMatrix.append(
+                    matrixInclude |
+                    { 'analysis-kinds': analysisKind }
+                )
+        matrix = newMatrix
+
+    # Construct the workflow steps needed for this check.
     steps = [
         {
             'name': 'Check out repository',