github/codeql-action
1
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2025-12-24 08:10:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use subdirectory for combined SARIF file

Browse Source
This commit is contained in:
Koen Vlaswinkel
2024-03-18 14:19:08 +01:00
parent ccc609bf1a
commit 7e30c622b0
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/upload-lib.js generated
View File

@@ -91,8 +91,8 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo
// Initialize CodeQL, either by using the config file from the 'init' step,
// or by initializing it here.
let codeQL;
let tempDir;
const config = await (0, config_utils_1.getConfig)(actionsUtil.getTemporaryDirectory(), logger);
let tempDir = actionsUtil.getTemporaryDirectory();
const config = await (0, config_utils_1.getConfig)(tempDir, logger);
if (config !== undefined) {
codeQL = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
tempDir = config.tempDir;
@@ -107,11 +107,13 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo
};
const codeQLDefaultVersionInfo = await features.getDefaultCliVersion(gitHubVersion.type);
const initCodeQLResult = await (0, init_1.initCodeQL)(undefined, // There is no tools input on the upload action
apiDetails, (0, actions_util_1.getTemporaryDirectory)(), gitHubVersion.type, codeQLDefaultVersionInfo, logger);
apiDetails, tempDir, gitHubVersion.type, codeQLDefaultVersionInfo, logger);
codeQL = initCodeQLResult.codeql;
tempDir = (0, actions_util_1.getTemporaryDirectory)();
}
const outputFile = path.resolve(tempDir, "combined-sarif.sarif");
const baseTempDir = path.resolve(tempDir, "combined-sarif");
fs.mkdirSync(baseTempDir, { recursive: true });
const outputDirectory = fs.mkdtempSync(path.resolve(baseTempDir, "output-"));
const outputFile = path.resolve(outputDirectory, "combined-sarif.sarif");
await codeQL.mergeResults(sarifFiles, outputFile, true);
return JSON.parse(fs.readFileSync(outputFile, "utf8"));
}