Skip to content

Commit 6ac5753

Browse files
committed
Use options object instead of boolean for mergeResults
1 parent e20c273 commit 6ac5753

File tree

6 files changed

+13
-7
lines changed

6 files changed

+13
-7
lines changed

lib/codeql.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/upload-lib.js

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/upload-lib.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/codeql.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ export interface CodeQL {
201201
mergeResults(
202202
sarifFiles: string[],
203203
outputFile: string,
204-
mergeRunsFromEqualCategory?: boolean,
204+
options: { mergeRunsFromEqualCategory?: boolean },
205205
): Promise<void>;
206206
}
207207

@@ -1093,7 +1093,9 @@ export async function getCodeQLForCmd(
10931093
async mergeResults(
10941094
sarifFiles: string[],
10951095
outputFile: string,
1096-
mergeRunsFromEqualCategory = false,
1096+
{
1097+
mergeRunsFromEqualCategory = false,
1098+
}: { mergeRunsFromEqualCategory?: boolean },
10971099
): Promise<void> {
10981100
const args = [
10991101
"github",

src/upload-lib.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ async function combineSarifFilesUsingCLI(
153153

154154
const outputFile = path.resolve(outputDirectory, "combined-sarif.sarif");
155155

156-
await codeQL.mergeResults(sarifFiles, outputFile, true);
156+
await codeQL.mergeResults(sarifFiles, outputFile, {
157+
mergeRunsFromEqualCategory: true,
158+
});
157159

158160
return JSON.parse(fs.readFileSync(outputFile, "utf8")) as SarifFile;
159161
}

0 commit comments

Comments
 (0)