From 5333e349ab6be9d81d67a1d19b3b4e7fd5ab3bab Mon Sep 17 00:00:00 2001
From: GitHub Inc Sponsored Developer Programme Sam Traders Smc Pvt Ltd
 <99934048+mmu094@users.noreply.github.com>
Date: Tue, 31 Oct 2023 13:57:01 +0500
Subject: [PATCH] Revert "[v4 beta] Fixes to download directory structure
 (#233)"

This reverts commit 88dadfbcfcdd10293192ac8ee1e3ffe61f7055ee.
---
 action.yml               | 2 +-
 dist/index.js            | 7 ++-----
 src/download-artifact.ts | 9 ++-------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/action.yml b/action.yml
index 0fd14b9..898a840 100644
--- a/action.yml
+++ b/action.yml
@@ -25,5 +25,5 @@ outputs:
   download-path:
     description: 'Path of artifact download'
 runs:
-  using: 'node20'
+  using: 'node16'
   main: 'dist/index.js'
diff --git a/dist/index.js b/dist/index.js
index 312a325..76b0501 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -118706,7 +118706,6 @@ function run() {
         if (inputs.path.startsWith(`~`)) {
             inputs.path = inputs.path.replace('~', os.homedir());
         }
-        const isSingleArtifactDownload = !!inputs.name;
         const resolvedPath = path.resolve(inputs.path);
         core.debug(`Resolved path is ${resolvedPath}`);
         const [owner, repo] = inputs.repository.split('/');
@@ -118715,8 +118714,7 @@ function run() {
         }
         const artifactClient = artifact.create();
         let artifacts = [];
-        if (isSingleArtifactDownload) {
-            core.info(`Downloading single artifact`);
+        if (inputs.name) {
             const { artifact: targetArtifact } = yield artifactClient.getArtifact(inputs.name, inputs.runID, owner, repo, inputs.token);
             if (!targetArtifact) {
                 throw new Error(`Artifact '${inputs.name}' not found`);
@@ -118725,7 +118723,6 @@ function run() {
             artifacts = [targetArtifact];
         }
         else {
-            core.info(`No input name specified, downloading all artifacts. Extra directory with the artifact name will be created for each download`);
             const listArtifactResponse = yield artifactClient.listArtifacts(inputs.runID, owner, repo, inputs.token);
             if (listArtifactResponse.artifacts.length === 0) {
                 throw new Error(`No artifacts found for run '${inputs.runID}' in '${inputs.repository}'`);
@@ -118734,7 +118731,7 @@ function run() {
             artifacts = listArtifactResponse.artifacts;
         }
         const downloadPromises = artifacts.map(artifact => artifactClient.downloadArtifact(artifact.id, owner, repo, inputs.token, {
-            path: isSingleArtifactDownload ? resolvedPath : path.join(resolvedPath, artifact.name)
+            path: path.join(resolvedPath, artifact.name)
         }));
         const chunkedPromises = exports.chunk(downloadPromises, PARALLEL_DOWNLOADS);
         for (const chunk of chunkedPromises) {
diff --git a/src/download-artifact.ts b/src/download-artifact.ts
index 778f899..2cdb916 100644
--- a/src/download-artifact.ts
+++ b/src/download-artifact.ts
@@ -30,7 +30,6 @@ async function run(): Promise<void> {
     inputs.path = inputs.path.replace('~', os.homedir())
   }
 
-  const isSingleArtifactDownload: boolean = !!inputs.name
   const resolvedPath = path.resolve(inputs.path)
   core.debug(`Resolved path is ${resolvedPath}`)
 
@@ -44,9 +43,7 @@ async function run(): Promise<void> {
   const artifactClient = artifact.create()
   let artifacts: artifact.Artifact[] = []
 
-  if (isSingleArtifactDownload) {
-    core.info(`Downloading single artifact`)
-
+  if (inputs.name) {
     const {artifact: targetArtifact} = await artifactClient.getArtifact(
       inputs.name,
       inputs.runID,
@@ -65,8 +62,6 @@ async function run(): Promise<void> {
 
     artifacts = [targetArtifact]
   } else {
-    core.info(`No input name specified, downloading all artifacts. Extra directory with the artifact name will be created for each download`)
-
     const listArtifactResponse = await artifactClient.listArtifacts(
       inputs.runID,
       owner,
@@ -86,7 +81,7 @@ async function run(): Promise<void> {
 
   const downloadPromises = artifacts.map(artifact =>
     artifactClient.downloadArtifact(artifact.id, owner, repo, inputs.token, {
-      path: isSingleArtifactDownload ? resolvedPath : path.join(resolvedPath, artifact.name)
+      path: path.join(resolvedPath, artifact.name)
     })
   )