Merge 0f84e7bc9c into 3cea537223

action.yml

@@ -8,6 +8,11 @@ inputs:
   path:
     description: 'A file, directory or wildcard pattern that describes what to upload'
     required: true
+  single-archive:
+    description: >
+      Whether or not all files for the action should be combined into a single archive
+      or uploaded as separate archives
+    default: 'true'
   if-no-files-found:
     description: >
       The desired behavior if no files are found using the provided path.

dist/index.js

@@ -4775,12 +4775,28 @@ function run() {
                 if (inputs.retentionDays) {
                     options.retentionDays = inputs.retentionDays;
                 }
-                const uploadResponse = yield artifactClient.uploadArtifact(inputs.artifactName, searchResult.filesToUpload, searchResult.rootDirectory, options);
-                if (uploadResponse.failedItems.length > 0) {
-                    core.setFailed(`An error was encountered when uploading ${uploadResponse.artifactName}. There were ${uploadResponse.failedItems.length} items that failed to upload.`);
+                if (inputs.singleArchive === 'false') {
+                    core.info(`Uploading artifacts as individual archives`);
+                    for (const fileToUpload of searchResult.filesToUpload) {
+                        const uploadName = inputs.artifactName.concat('_'.concat(fileToUpload.substring(fileToUpload.lastIndexOf('/') + 1)));
+                        core.info(`Attempting to upload artifact with name: ${uploadName} at path ${fileToUpload}`);
+                        const uploadResponse = yield artifactClient.uploadArtifact(uploadName, [fileToUpload], searchResult.rootDirectory, options);
+                        if (uploadResponse.failedItems.length > 0) {
+                            core.setFailed(`An error was encountered when uploading ${uploadName}. There were ${uploadResponse.failedItems.length} items that failed to upload.`);
+                        }
+                        else {
+                            core.info(`Artifact ${uploadName} has been successfully uploaded!`);
+                        }
+                    }
                 }
                 else {
-                    core.info(`Artifact ${uploadResponse.artifactName} has been successfully uploaded!`);
+                    const uploadResponse = yield artifactClient.uploadArtifact(inputs.artifactName, searchResult.filesToUpload, searchResult.rootDirectory, options);
+                    if (uploadResponse.failedItems.length > 0) {
+                        core.setFailed(`An error was encountered when uploading ${uploadResponse.artifactName}. There were ${uploadResponse.failedItems.length} items that failed to upload.`);
+                    }
+                    else {
+                        core.info(`Artifact ${uploadResponse.artifactName} has been successfully uploaded!`);
+                    }
                 }
             }
         }
@@ -7178,12 +7194,17 @@ function getInputs() {
     const path = core.getInput(constants_1.Inputs.Path, { required: true });
     const ifNoFilesFound = core.getInput(constants_1.Inputs.IfNoFilesFound);
     const noFileBehavior = constants_1.NoFileOptions[ifNoFilesFound];
+    const single = core.getInput(constants_1.Inputs.SingleArchive) || 'true';
     if (!noFileBehavior) {
         core.setFailed(`Unrecognized ${constants_1.Inputs.IfNoFilesFound} input. Provided: ${ifNoFilesFound}. Available options: ${Object.keys(constants_1.NoFileOptions)}`);
     }
+    if (single !== 'true' && single !== 'false') {
+        core.setFailed(`Unrecognized ${constants_1.Inputs.SingleArchive} input. Provided: ${single}. Must be 'true' or 'false'.`);
+    }
     const inputs = {
         artifactName: name,
         searchPath: path,
+        singleArchive: single,
         ifNoFilesFound: noFileBehavior
     };
     const retentionDaysStr = core.getInput(constants_1.Inputs.RetentionDays);
@@ -8194,6 +8215,7 @@ var Inputs;
 (function (Inputs) {
     Inputs["Name"] = "name";
     Inputs["Path"] = "path";
+    Inputs["SingleArchive"] = "single-archive";
     Inputs["IfNoFilesFound"] = "if-no-files-found";
     Inputs["RetentionDays"] = "retention-days";
 })(Inputs = exports.Inputs || (exports.Inputs = {}));

src/constants.ts

@@ -1,6 +1,7 @@
 export enum Inputs {
   Name = 'name',
   Path = 'path',
+  SingleArchive = 'single-archive',
   IfNoFilesFound = 'if-no-files-found',
   RetentionDays = 'retention-days'
 }

src/input-helper.ts

@@ -11,6 +11,7 @@ export function getInputs(): UploadInputs {
 
   const ifNoFilesFound = core.getInput(Inputs.IfNoFilesFound)
   const noFileBehavior: NoFileOptions = NoFileOptions[ifNoFilesFound]
+  const single = core.getInput(Inputs.SingleArchive) || 'true'
 
   if (!noFileBehavior) {
     core.setFailed(
@@ -22,9 +23,16 @@ export function getInputs(): UploadInputs {
     )
   }
 
+  if (single !== 'true' && single !== 'false') {
+    core.setFailed(
+      `Unrecognized ${Inputs.SingleArchive} input. Provided: ${single}. Must be 'true' or 'false'.`
+    )
+  }
+
   const inputs = {
     artifactName: name,
     searchPath: path,
+    singleArchive: single,
     ifNoFilesFound: noFileBehavior
   } as UploadInputs
 

src/upload-artifact.ts

@@ -8,6 +8,7 @@ async function run(): Promise<void> {
   try {
     const inputs = getInputs()
     const searchResult = await findFilesToUpload(inputs.searchPath)
+
     if (searchResult.filesToUpload.length === 0) {
       // No files were found, different use cases warrant different types of behavior if nothing is found
       switch (inputs.ifNoFilesFound) {
@@ -51,21 +52,50 @@ async function run(): Promise<void> {
         options.retentionDays = inputs.retentionDays
       }
 
-      const uploadResponse = await artifactClient.uploadArtifact(
-        inputs.artifactName,
-        searchResult.filesToUpload,
-        searchResult.rootDirectory,
-        options
-      )
+      if (inputs.singleArchive === 'false') {
+        core.info(`Uploading artifacts as individual archives`)
 
-      if (uploadResponse.failedItems.length > 0) {
-        core.setFailed(
-          `An error was encountered when uploading ${uploadResponse.artifactName}. There were ${uploadResponse.failedItems.length} items that failed to upload.`
-        )
+        for (const fileToUpload of searchResult.filesToUpload) {
+          const uploadName = inputs.artifactName.concat(
+            '_'.concat(
+              fileToUpload.substring(fileToUpload.lastIndexOf('/') + 1)
+            )
+          )
+          core.info(
+            `Attempting to upload artifact with name: ${uploadName} at path ${fileToUpload}`
+          )
+          const uploadResponse = await artifactClient.uploadArtifact(
+            uploadName,
+            [fileToUpload],
+            searchResult.rootDirectory,
+            options
+          )
+
+          if (uploadResponse.failedItems.length > 0) {
+            core.setFailed(
+              `An error was encountered when uploading ${uploadName}. There were ${uploadResponse.failedItems.length} items that failed to upload.`
+            )
+          } else {
+            core.info(`Artifact ${uploadName} has been successfully uploaded!`)
+          }
+        }
       } else {
-        core.info(
-          `Artifact ${uploadResponse.artifactName} has been successfully uploaded!`
+        const uploadResponse = await artifactClient.uploadArtifact(
+          inputs.artifactName,
+          searchResult.filesToUpload,
+          searchResult.rootDirectory,
+          options
         )
+
+        if (uploadResponse.failedItems.length > 0) {
+          core.setFailed(
+            `An error was encountered when uploading ${uploadResponse.artifactName}. There were ${uploadResponse.failedItems.length} items that failed to upload.`
+          )
+        } else {
+          core.info(
+            `Artifact ${uploadResponse.artifactName} has been successfully uploaded!`
+          )
+        }
       }
     }
   } catch (err) {

src/upload-inputs.ts

@@ -11,6 +11,11 @@ export interface UploadInputs {
    */
   searchPath: string
 
+  /**
+   * Whether or not to upload artifacts as a single archive or as individual files
+   */
+  singleArchive: string
+
   /**
    * The desired behavior if no files are found with the provided search path
    */