robojerk/codeql-action

Merge branch 'main' into fix/205

Browse source
This commit is contained in:
Chris Raynor 2020-09-28 11:20:31 +01:00 • committed by GitHub
commit a2931d32c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.eslintrc.json
View file

@ -48,7 +48,6 @@
"github/no-then": "off", "github/no-then": "off",
"import/no-extraneous-dependencies": "off", "import/no-extraneous-dependencies": "off",
"no-shadow": "off", "no-shadow": "off",
"no-throw-literal": "off",
"sort-imports": "off" "sort-imports": "off"
} }
}] }]

2
lib/upload-lib.js generated
View file

@ -34,7 +34,7 @@ function combineSarifFiles(sarifFiles) {
combinedSarif.version = sarifObject.version; combinedSarif.version = sarifObject.version;
} }
else if (combinedSarif.version !== sarifObject.version) { else if (combinedSarif.version !== sarifObject.version) {
throw `Different SARIF versions encountered: ${combinedSarif.version} and ${sarifObject.version}`; throw new Error(`Different SARIF versions encountered: ${combinedSarif.version} and ${sarifObject.version}`);
} }
combinedSarif.runs.push(...sarifObject.runs); combinedSarif.runs.push(...sarifObject.runs);
} }

2
lib/upload-lib.js.map
View file

File diff suppressed because one or more lines are too long

4
src/upload-lib.ts
View file

@ -26,7 +26,9 @@ export function combineSarifFiles(sarifFiles: string[]): string {
if (combinedSarif.version === null) { if (combinedSarif.version === null) {
combinedSarif.version = sarifObject.version; combinedSarif.version = sarifObject.version;
} else if (combinedSarif.version !== sarifObject.version) { } else if (combinedSarif.version !== sarifObject.version) {
throw `Different SARIF versions encountered: ${combinedSarif.version} and ${sarifObject.version}`; throw new Error(
`Different SARIF versions encountered: ${combinedSarif.version} and ${sarifObject.version}`
);
} }
combinedSarif.runs.push(...sarifObject.runs); combinedSarif.runs.push(...sarifObject.runs);