Fix move artifact files issue on linux. (#6927)

Fix move artifact files issue on linux.
microsoft · Apr 10, 2018 · 8b4bbf6 · 8b4bbf6
1 parent 3e29d1c
commit 8b4bbf6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/Tasks/JenkinsDownloadArtifacts/jenkinsdownloadartifacts.ts b/Tasks/JenkinsDownloadArtifacts/jenkinsdownloadartifacts.ts
@@ -19,6 +19,7 @@ import { JenkinsRestClient, JenkinsJobDetails } from "./ArtifactDetails/JenkinsR
 var DecompressZip = require('decompress-zip');
 var fsExtra = require('fs-extra');
 var taskJson = require('./task.json');
+var uuidv4 = require('uuid/v4');
 
 const area: string = 'JenkinsDownloadArtifacts';
 
@@ -171,9 +172,23 @@ async function doWork() {
                     tl.rmRF(zipLocation);
                 }
 
-                fsExtra.move(path.join(localPathRoot, "archive"), localPathRoot).catch((error) => {
-                    throw error;
-                });
+                var archivePath = path.join(localPathRoot, "archive");
+                var tempPath = path.join(localPathRoot, uuidv4());
+                fsExtra.move(archivePath, tempPath)
+                    .then(() => {
+                        fsExtra.copy(tempPath, localPathRoot)
+                            .then(() => {
+                                fsExtra.remove(tempPath).catch((error) => {
+                                    throw error;
+                                });
+                            })
+                            .catch((error) => {
+                                throw error;
+                            });
+                    })
+                    .catch((error) => {
+                        throw error;
+                    });
             }
             else {
                 await getArtifactsFromUrl(artifactQueryUrl, strictSSL, localPathRoot, itemPattern, handler, variables);

diff --git a/Tasks/JenkinsDownloadArtifacts/task.json b/Tasks/JenkinsDownloadArtifacts/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 1,
         "Minor": 133,
-        "Patch": 1
+        "Patch": 2
     },
     "groups": [
         {

diff --git a/Tasks/JenkinsDownloadArtifacts/task.loc.json b/Tasks/JenkinsDownloadArtifacts/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 1,
     "Minor": 133,
-    "Patch": 1
+    "Patch": 2
   },
   "groups": [
     {