Fix sarif-ids format not matching documentation

This commit is contained in:
Michael B. Gale
2025-09-26 14:02:53 +01:00
parent 4c60b18145
commit 0e1ad534f3
4 changed files with 13 additions and 11 deletions
+1 -1
View File
@@ -89,7 +89,7 @@ jobs:
ref: refs/heads/main
sha: 5e235361806c361d4d3f8859e3c897658025a9a2
- name: Check output from `upload-sarif` step
if: fromJSON(steps.upload-sarif.outputs.sarif-ids)[0].analysis != 'code-quality'
if: !fromJSON(steps.upload-sarif.outputs.sarif-ids).code-quality
run: exit 1
env:
CODEQL_ACTION_TEST_MODE: true
+5 -4
View File
@@ -93475,10 +93475,11 @@ async function uploadSarif(logger, features, sarifPath, pathStats, checkoutPath,
return uploadResults;
}
function uploadResultsToSarifIds(uploadResults) {
return Object.entries(uploadResults).map(([analysisKind, result]) => ({
analysis: analysisKind,
id: result.sarifID
}));
const result = {};
for (const uploadResult of Object.keys(uploadResults)) {
result[uploadResult] = uploadResults[uploadResult].id;
}
return result;
}
// src/upload-sarif-action.ts
+1 -1
View File
@@ -22,5 +22,5 @@ steps:
ref: 'refs/heads/main'
sha: '5e235361806c361d4d3f8859e3c897658025a9a2'
- name: "Check output from `upload-sarif` step"
if: fromJSON(steps.upload-sarif.outputs.sarif-ids)[0].analysis != 'code-quality'
if: !fromJSON(steps.upload-sarif.outputs.sarif-ids).code-quality
run: exit 1
+6 -5
View File
@@ -101,9 +101,10 @@ export async function uploadSarif(
export function uploadResultsToSarifIds(
uploadResults: UploadSarifResults,
): UploadSarifResult[] {
return Object.entries(uploadResults).map(([analysisKind, result]) => ({
analysis: analysisKind as analyses.AnalysisKind,
id: result.sarifID,
}));
): Partial<Record<analyses.AnalysisKind, string>> {
const result = {};
for (const uploadResult of Object.keys(uploadResults)) {
result[uploadResult] = uploadResults[uploadResult].id;
}
return result;
}