Don't fail if no source/binaries were matched

tylercamp · tylercamp · commit 1858d5ac04f2 · 2022-09-07T13:30:20.000-04:00
diff --git a/analyze.js b/analyze.js
@@ -77,12 +77,11 @@ async function attachInputsZip(inputGlobs, formData, tmpDir) {
   const zipTarget = path.join(tmpDir, "codedx-inputfiles.zip")
   const numFiles = await prepareInputsZip(inputGlobs, zipTarget)
   if (numFiles == 0) {
-    throw new Error("No files were matched by the source/binary glob(s)")
+    core.warning("No files were matched by the 'source-and-binaries-glob' values, skipping source/binaries ZIP attachment")
   } else {
     core.info(`Added ${numFiles} files`)
+    formData.append('source-and-binaries.zip', fs.createReadStream(zipTarget))
   }
-
-  formData.append('source-and-binaries.zip', fs.createReadStream(zipTarget))
 }
 
 async function attachScanFiles(scanGlobs, formData) {
diff --git a/dist/index.js b/dist/index.js
@@ -84,12 +84,11 @@ async function attachInputsZip(inputGlobs, formData, tmpDir) {
   const zipTarget = path.join(tmpDir, "codedx-inputfiles.zip")
   const numFiles = await prepareInputsZip(inputGlobs, zipTarget)
   if (numFiles == 0) {
-    throw new Error("No files were matched by the source/binary glob(s)")
+    core.warning("No files were matched by the 'source-and-binaries-glob' values, skipping source/binaries ZIP attachment")
   } else {
     core.info(`Added ${numFiles} files`)
+    formData.append('source-and-binaries.zip', fs.createReadStream(zipTarget))
   }
-
-  formData.append('source-and-binaries.zip', fs.createReadStream(zipTarget))
 }
 
 async function attachScanFiles(scanGlobs, formData) {
diff --git a/dist/index.js.map b/dist/index.js.map

Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,11 @@ async function attachInputsZip(inputGlobs, formData, tmpDir) {`
`77`	`77`	`const zipTarget = path.join(tmpDir, "codedx-inputfiles.zip")`
`78`	`78`	`const numFiles = await prepareInputsZip(inputGlobs, zipTarget)`
`79`	`79`	`if (numFiles == 0) {`
`80`		`- throw new Error("No files were matched by the source/binary glob(s)")`
	`80`	`+ core.warning("No files were matched by the 'source-and-binaries-glob' values, skipping source/binaries ZIP attachment")`
`81`	`81`	`} else {`
`82`	`82`	core.info(`Added ${numFiles} files`)
	`83`	`+ formData.append('source-and-binaries.zip', fs.createReadStream(zipTarget))`
`83`	`84`	`}`
`84`		`-`
`85`		`- formData.append('source-and-binaries.zip', fs.createReadStream(zipTarget))`
`86`	`85`	`}`
`87`	`86`
`88`	`87`	`async function attachScanFiles(scanGlobs, formData) {`
Original file line number	Diff line number	Diff line change
`@@ -84,12 +84,11 @@ async function attachInputsZip(inputGlobs, formData, tmpDir) {`
`84`	`84`	`const zipTarget = path.join(tmpDir, "codedx-inputfiles.zip")`
`85`	`85`	`const numFiles = await prepareInputsZip(inputGlobs, zipTarget)`
`86`	`86`	`if (numFiles == 0) {`
`87`		`- throw new Error("No files were matched by the source/binary glob(s)")`
	`87`	`+ core.warning("No files were matched by the 'source-and-binaries-glob' values, skipping source/binaries ZIP attachment")`
`88`	`88`	`} else {`
`89`	`89`	core.info(`Added ${numFiles} files`)
	`90`	`+ formData.append('source-and-binaries.zip', fs.createReadStream(zipTarget))`
`90`	`91`	`}`
`91`		`-`
`92`		`- formData.append('source-and-binaries.zip', fs.createReadStream(zipTarget))`
`93`	`92`	`}`
`94`	`93`
`95`	`94`	`async function attachScanFiles(scanGlobs, formData) {`