Skip to content

Fix upload-sarif Action failing if there are no Code Scanning SARIF files #3123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbg merged 10 commits into from
Sep 19, 2025
Merged

Fix upload-sarif Action failing if there are no Code Scanning SARIF files #3123

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
35454d3
Refactor CQ SARIF upload in `upload-sarif` into a function
mbg Sep 18, 2025
a6161a8
Call `lstatSync` on `sarifPath` earlier and check that the path exist…
mbg Sep 18, 2025
c8e017d
Move `isDirectory` check into `findAndUpload`
mbg Sep 18, 2025
696b467
Handle single file case in `findAndUpload`
mbg Sep 18, 2025
a2ce099
Use `findAndUpload` for Code Scanning
mbg Sep 18, 2025
d378195
Add new `sarif-ids` output to `upload-sarif` action
mbg Sep 18, 2025
7bea0e2
Fix outdated comment
mbg Sep 18, 2025
e33b0ab
Update `upload-quality-sarif` check to only use `code-quality`
mbg Sep 18, 2025
6249793
Disable `cpp` in `upload-quality-sarif` check
mbg Sep 18, 2025
db37d92
Fix condition
mbg Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move isDirectory check into findAndUpload
  • Loading branch information
@mbg
mbg committed Sep 18, 2025
commit c8e017d3e778faac9a5b2898085a763c1198b3d1
47 changes: 24 additions & 23 deletions lib/upload-sarif-action.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 26 additions & 23 deletions src/upload-sarif-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ interface UploadSarifStatusReport
* @param logger The logger to use.
* @param features Information about FFs.
* @param sarifPath The path to a directory containing SARIF files.
* @param pathStats Information about `sarifPath`.
* @param checkoutPath The checkout path.
* @param analysis The configuration of the analysis we should upload SARIF files for.
* @param category The SARIF category to use for the upload.
Expand All @@ -48,24 +49,27 @@ async function findAndUpload(
logger: Logger,
features: Features,
sarifPath: string,
pathStats: fs.Stats,
checkoutPath: string,
analysis: analyses.AnalysisConfig,
category?: string,
): Promise<upload_lib.UploadResult | undefined> {
const sarifFiles = upload_lib.findSarifFilesInDir(
sarifPath,
analysis.sarifPredicate,
);

if (sarifFiles.length !== 0) {
return await upload_lib.uploadSpecifiedFiles(
sarifFiles,
checkoutPath,
category,
features,
logger,
analysis,
if (pathStats.isDirectory()) {
const sarifFiles = upload_lib.findSarifFilesInDir(
sarifPath,
analysis.sarifPredicate,
);

if (sarifFiles.length !== 0) {
return await upload_lib.uploadSpecifiedFiles(
sarifFiles,
checkoutPath,
category,
features,
logger,
analysis,
);
}
}

return undefined;
Expand Down Expand Up @@ -148,16 +152,15 @@ async function run() {
// If there are `.quality.sarif` files in `sarifPath`, then upload those to the code quality service.
// Code quality can currently only be enabled on top of security, so we'd currently always expect to
// have a directory for the results here.
if (pathStats.isDirectory()) {
await findAndUpload(
logger,
features,
sarifPath,
checkoutPath,
analyses.CodeQuality,
actionsUtil.fixCodeQualityCategory(logger, category),
);
}
await findAndUpload(
logger,
features,
sarifPath,
pathStats,
checkoutPath,
analyses.CodeQuality,
actionsUtil.fixCodeQualityCategory(logger, category),
);

// We don't upload results in test mode, so don't wait for processing
if (isInTestMode()) {
Expand Down