fixup the $schema in all .sarif files

erik-krogh · erik-krogh · commit 1856e2b3891c · 2022-06-19T20:09:31.000+02:00
diff --git a/.github/workflows/ql-for-ql-build.yml b/.github/workflows/ql-for-ql-build.yml
@@ -192,6 +192,9 @@ jobs:
           category: "ql-for-ql-${{ matrix.folder }}"
       - name: Copy sarif file to CWD
         run: cp ../results/ql.sarif ./${{ matrix.folder }}.sarif
+      - name: Fixup the $scema in sarif  # Until https://github.com/microsoft/sarif-vscode-extension/pull/436/ is part in a stable release
+        run: |
+          sed -i 's/\$schema.*/\$schema": "https:\/\/raw.githubusercontent.com\/oasis-tcs\/sarif-spec\/master\/Schemata\/sarif-schema-2.1.0",/' ${{ matrix.folder }}.sarif 
       - name: Sarif as artifact
         uses: actions/upload-artifact@v3
         with:
diff --git a/ql/scripts/merge-sarif.js b/ql/scripts/merge-sarif.js
@@ -18,9 +18,6 @@ async function main(files) {
   out.runs[0].artifacts = []; // the indexes in these won't make sense, so I hope this works.
   out.runs[0].results = combinedResults;
 
-  // workaround until https://github.com/microsoft/sarif-vscode-extension/pull/436/ is part of a release
-  out["$schema"] = "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0"; 
-
   fs.writeFileSync(outFile, JSON.stringify(out, null, 2));
 }
 main(process.argv.splice(2));

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,6 @@ async function main(files) {`
`18`	`18`	`out.runs[0].artifacts = []; // the indexes in these won't make sense, so I hope this works.`
`19`	`19`	`out.runs[0].results = combinedResults;`
`20`	`20`
`21`		`- // workaround until https://github.com/microsoft/sarif-vscode-extension/pull/436/ is part of a release`
`22`		`- out["$schema"] = "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0";`
`23`		`-`
`24`	`21`	`fs.writeFileSync(outFile, JSON.stringify(out, null, 2));`
`25`	`22`	`}`
`26`	`23`	`main(process.argv.splice(2));`