robojerk/codeql-action

Merge branch 'master' into report-upload-failures

Browse source
This commit is contained in:
Joshua Hale 2020-05-01 15:52:35 +01:00
commit 43e27012da
No known key found for this signature in database
GPG key ID: 4823A6DB4B5E32E1
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/upload-lib.js generated
View file

@ -109,6 +109,10 @@ async function upload(input) {
const sarifFiles = fs.readdirSync(input) const sarifFiles = fs.readdirSync(input)
.filter(f => f.endsWith(".sarif")) .filter(f => f.endsWith(".sarif"))
.map(f => path.resolve(input, f)); .map(f => path.resolve(input, f));
if (sarifFiles.length === 0) {
core.setFailed("No SARIF files found to upload in \"" + input + "\".");
return false;
}
return await uploadFiles(sarifFiles); return await uploadFiles(sarifFiles);
} }
else { else {
@ -135,7 +139,7 @@ async function uploadFiles(sarifFiles) {
const ref = util.getRequiredEnvParam('GITHUB_REF'); // it's in the form "refs/heads/master" const ref = util.getRequiredEnvParam('GITHUB_REF'); // it's in the form "refs/heads/master"
const analysisName = util.getRequiredEnvParam('GITHUB_WORKFLOW'); const analysisName = util.getRequiredEnvParam('GITHUB_WORKFLOW');
const startedAt = process.env[sharedEnv.CODEQL_ACTION_STARTED_AT]; const startedAt = process.env[sharedEnv.CODEQL_ACTION_STARTED_AT];
core.debug("Uploading sarif files: " + JSON.stringify(sarifFiles)); core.info("Uploading sarif files: " + JSON.stringify(sarifFiles));
let sarifPayload = combineSarifFiles(sarifFiles); let sarifPayload = combineSarifFiles(sarifFiles);
sarifPayload = fingerprints.addFingerprints(sarifPayload); sarifPayload = fingerprints.addFingerprints(sarifPayload);
const zipped_sarif = zlib_1.default.gzipSync(sarifPayload).toString('base64'); const zipped_sarif = zlib_1.default.gzipSync(sarifPayload).toString('base64');

6
src/upload-lib.ts
View file

@ -112,6 +112,10 @@ export async function upload(input: string): Promise<boolean> {
const sarifFiles = fs.readdirSync(input) const sarifFiles = fs.readdirSync(input)
.filter(f => f.endsWith(".sarif")) .filter(f => f.endsWith(".sarif"))
.map(f => path.resolve(input, f)); .map(f => path.resolve(input, f));
if (sarifFiles.length === 0) {
core.setFailed("No SARIF files found to upload in \"" + input + "\".");
return false;
}
return await uploadFiles(sarifFiles); return await uploadFiles(sarifFiles);
} else { } else {
return await uploadFiles([input]); return await uploadFiles([input]);
@ -139,7 +143,7 @@ async function uploadFiles(sarifFiles: string[]): Promise<boolean> {
const analysisName = util.getRequiredEnvParam('GITHUB_WORKFLOW'); const analysisName = util.getRequiredEnvParam('GITHUB_WORKFLOW');
const startedAt = process.env[sharedEnv.CODEQL_ACTION_STARTED_AT]; const startedAt = process.env[sharedEnv.CODEQL_ACTION_STARTED_AT];
core.debug("Uploading sarif files: " + JSON.stringify(sarifFiles)); core.info("Uploading sarif files: " + JSON.stringify(sarifFiles));
let sarifPayload = combineSarifFiles(sarifFiles); let sarifPayload = combineSarifFiles(sarifFiles);
sarifPayload = fingerprints.addFingerprints(sarifPayload); sarifPayload = fingerprints.addFingerprints(sarifPayload);