Added support for uploading multiple artifacts

dist/index.js

@@ -4028,20 +4028,24 @@ function run() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             const inputs = input_helper_1.getInputs();
-            const searchResult = yield search_1.findFilesToUpload(inputs.searchPath);
+            for (let i = 0; i < inputs.searchPath.length; i++) {
+                const searchPath = inputs.searchPath[i];
+                const artifactName = inputs.artifactName[i];
+                const retentionDays = inputs.retentionDays[i];
+                const searchResult = yield search_1.findFilesToUpload(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) {
                         case constants_1.NoFileOptions.warn: {
-                        core.warning(`No files were found with the provided path: ${inputs.searchPath}. No artifacts will be uploaded.`);
+                            core.warning(`No files were found with the provided path: ${searchPath}. No artifacts will be uploaded.`);
                             break;
                         }
                         case constants_1.NoFileOptions.error: {
-                        core.setFailed(`No files were found with the provided path: ${inputs.searchPath}. No artifacts will be uploaded.`);
+                            core.setFailed(`No files were found with the provided path: ${searchPath}. No artifacts will be uploaded.`);
                             break;
                         }
                         case constants_1.NoFileOptions.ignore: {
-                        core.info(`No files were found with the provided path: ${inputs.searchPath}. No artifacts will be uploaded.`);
+                            core.info(`No files were found with the provided path: ${searchPath}. No artifacts will be uploaded.`);
                             break;
                         }
                     }
@@ -4057,10 +4061,10 @@ function run() {
                     const options = {
                         continueOnError: false
                     };
-                if (inputs.retentionDays) {
+                    if (retentionDays) {
-                    options.retentionDays = inputs.retentionDays;
+                        options.retentionDays = retentionDays;
                     }
-                const uploadResponse = yield artifactClient.uploadArtifact(inputs.artifactName, searchResult.filesToUpload, searchResult.rootDirectory, options);
+                    const uploadResponse = yield artifactClient.uploadArtifact(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.`);
                     }
@@ -4069,6 +4073,7 @@ function run() {
                     }
                 }
             }
+        }
         catch (err) {
             core.setFailed(err.message);
         }
@@ -6576,26 +6581,49 @@ const constants_1 = __webpack_require__(694);
 function getInputs() {
     const name = core.getInput(constants_1.Inputs.Name);
     const path = core.getInput(constants_1.Inputs.Path, { required: true });
+    const searchPath = Array.isArray(path) ? path : [path];
+    const defaultArtifactName = 'artifact';
+    // Accepts an individual value or an array as input, if array sizes don't match, use default value instead
+    const artifactName = Array.isArray(name)
+        ? name.concat(new Array(Math.max(0, searchPath.length - name.length)).fill(defaultArtifactName))
+        : new Array(searchPath.length).fill(name || defaultArtifactName);
     const ifNoFilesFound = core.getInput(constants_1.Inputs.IfNoFilesFound);
     const noFileBehavior = constants_1.NoFileOptions[ifNoFilesFound];
     if (!noFileBehavior) {
         core.setFailed(`Unrecognized ${constants_1.Inputs.IfNoFilesFound} input. Provided: ${ifNoFilesFound}. Available options: ${Object.keys(constants_1.NoFileOptions)}`);
     }
     const inputs = {
-        artifactName: name,
+        artifactName,
-        searchPath: path,
+        searchPath,
         ifNoFilesFound: noFileBehavior
     };
-    const retentionDaysStr = core.getInput(constants_1.Inputs.RetentionDays);
+    // Accepts an individual value or an array as input
-    if (retentionDaysStr) {
+    const retentionDays = core.getInput(constants_1.Inputs.RetentionDays);
-        inputs.retentionDays = parseInt(retentionDaysStr);
+    if (Array.isArray(retentionDays)) {
-        if (isNaN(inputs.retentionDays)) {
+        // If array sizes don't match, use default value instead
-            core.setFailed('Invalid retention-days');
+        inputs.retentionDays = retentionDays
+            .map(parseRetentionDays)
+            .concat(new Array(Math.max(0, searchPath.length - retentionDays.length)).fill(undefined));
     }
+    else {
+        const retention = parseRetentionDays(retentionDays);
+        inputs.retentionDays = new Array(searchPath.length).fill(retention);
     }
     return inputs;
 }
 exports.getInputs = getInputs;
+function parseRetentionDays(retentionDaysStr) {
+    if (retentionDaysStr) {
+        const retentionDays = parseInt(retentionDaysStr);
+        if (isNaN(retentionDays)) {
+            core.setFailed('Invalid retention-days');
+        }
+        return retentionDays;
+    }
+    else {
+        return undefined;
+    }
+}
 
 
 /***/ }),

src/input-helper.ts

@@ -9,6 +9,18 @@ export function getInputs(): UploadInputs {
   const name = core.getInput(Inputs.Name)
   const path = core.getInput(Inputs.Path, {required: true})
 
+  const searchPath = Array.isArray(path) ? path : [path]
+
+  const defaultArtifactName = 'artifact'
+  // Accepts an individual value or an array as input, if array sizes don't match, use default value instead
+  const artifactName = Array.isArray(name)
+    ? name.concat(
+        new Array(Math.max(0, searchPath.length - name.length)).fill(
+          defaultArtifactName
+        )
+      )
+    : new Array(searchPath.length).fill(name || defaultArtifactName)
+
   const ifNoFilesFound = core.getInput(Inputs.IfNoFilesFound)
   const noFileBehavior: NoFileOptions = NoFileOptions[ifNoFilesFound]
 
@@ -23,18 +35,40 @@ export function getInputs(): UploadInputs {
   }
 
   const inputs = {
-    artifactName: name,
+    artifactName,
-    searchPath: path,
+    searchPath,
     ifNoFilesFound: noFileBehavior
   } as UploadInputs
 
-  const retentionDaysStr = core.getInput(Inputs.RetentionDays)
+  // Accepts an individual value or an array as input
-  if (retentionDaysStr) {
+  const retentionDays = core.getInput(Inputs.RetentionDays)
-    inputs.retentionDays = parseInt(retentionDaysStr)
+  if (Array.isArray(retentionDays)) {
-    if (isNaN(inputs.retentionDays)) {
+    // If array sizes don't match, use default value instead
-      core.setFailed('Invalid retention-days')
+    inputs.retentionDays = retentionDays
-    }
+      .map(parseRetentionDays)
+      .concat(
+        new Array(Math.max(0, searchPath.length - retentionDays.length)).fill(
+          undefined
+        )
+      )
+  } else {
+    const retention = parseRetentionDays(retentionDays)
+    inputs.retentionDays = new Array(searchPath.length).fill(retention)
   }
 
   return inputs
 }
+
+function parseRetentionDays(
+  retentionDaysStr: string | undefined
+): number | undefined {
+  if (retentionDaysStr) {
+    const retentionDays = parseInt(retentionDaysStr)
+    if (isNaN(retentionDays)) {
+      core.setFailed('Invalid retention-days')
+    }
+    return retentionDays
+  } else {
+    return undefined
+  }
+}

src/upload-artifact.ts

@@ -7,25 +7,31 @@ import {NoFileOptions} from './constants'
 async function run(): Promise<void> {
   try {
     const inputs = getInputs()
-    const searchResult = await findFilesToUpload(inputs.searchPath)
+
+    for (let i = 0; i < inputs.searchPath.length; i++) {
+      const searchPath = inputs.searchPath[i]
+      const artifactName = inputs.artifactName[i]
+      const retentionDays = inputs.retentionDays[i]
+
+      const searchResult = await findFilesToUpload(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) {
           case NoFileOptions.warn: {
             core.warning(
-            `No files were found with the provided path: ${inputs.searchPath}. No artifacts will be uploaded.`
+              `No files were found with the provided path: ${searchPath}. No artifacts will be uploaded.`
             )
             break
           }
           case NoFileOptions.error: {
             core.setFailed(
-            `No files were found with the provided path: ${inputs.searchPath}. No artifacts will be uploaded.`
+              `No files were found with the provided path: ${searchPath}. No artifacts will be uploaded.`
             )
             break
           }
           case NoFileOptions.ignore: {
             core.info(
-            `No files were found with the provided path: ${inputs.searchPath}. No artifacts will be uploaded.`
+              `No files were found with the provided path: ${searchPath}. No artifacts will be uploaded.`
             )
             break
           }
@@ -47,12 +53,12 @@ async function run(): Promise<void> {
         const options: UploadOptions = {
           continueOnError: false
         }
-      if (inputs.retentionDays) {
+        if (retentionDays) {
-        options.retentionDays = inputs.retentionDays
+          options.retentionDays = retentionDays
         }
 
         const uploadResponse = await artifactClient.uploadArtifact(
-        inputs.artifactName,
+          artifactName,
           searchResult.filesToUpload,
           searchResult.rootDirectory,
           options
@@ -68,6 +74,7 @@ async function run(): Promise<void> {
           )
         }
       }
+    }
   } catch (err) {
     core.setFailed(err.message)
   }

src/upload-inputs.ts

@@ -4,12 +4,12 @@ export interface UploadInputs {
   /**
    * The name of the artifact that will be uploaded
    */
-  artifactName: string
+  artifactName: string[]
 
   /**
    * The search path used to describe what to upload as part of the artifact
    */
-  searchPath: string
+  searchPath: string[]
 
   /**
    * The desired behavior if no files are found with the provided search path
@@ -19,5 +19,5 @@ export interface UploadInputs {
   /**
    * Duration after which artifact will expire in days
    */
-  retentionDays: number
+  retentionDays: (number | undefined)[]
 }