DownloadBuildArtifacts - Use latest build filtered by branch

Tasks/DownloadBuildArtifacts/main.ts

@@ -6,6 +6,7 @@ import * as tl from 'vsts-task-lib/task';
 import { IBuildApi } from './vso-node-api/BuildApi';
 import { IRequestHandler } from './vso-node-api/interfaces/common/VsoBaseInterfaces';
 import { WebApi, getHandlerFromToken } from './vso-node-api/WebApi';
+import { BuildStatus, BuildResult, BuildQueryOrder } from './vso-node-api/interfaces/BuildInterfaces';
 
 import * as models from 'artifact-engine/Models';
 import * as engine from 'artifact-engine/Engine';
@@ -64,6 +65,7 @@ async function main(): Promise<void> {
         var definitionIdSpecified: string = null;
         var definitionIdTriggered: string = null;
         var buildId: number = null;
+        var branchName: string =  tl.getInput("branchName", false);;
         var downloadPath: string = tl.getInput("downloadPath", true);
         var downloadType: string = tl.getInput("downloadType", true);
 
@@ -126,12 +128,28 @@ async function main(): Promise<void> {
                 // Triggering build info not found, or requested, default to specified build info
                 projectId = tl.getInput("project", true);
                 definitionId = definitionIdSpecified;
-                buildId = parseInt(tl.getInput("buildId", true));
+                buildId = parseInt(tl.getInput("buildId", false));
             }
         }
 
         // verify that buildId belongs to the definition selected
         if (definitionId) {
+            if (!buildId){ 
+                // get latest successful build filtered by branch
+                var branchNameFilter = (branchName == "*") ? null : branchName;
+
+                var buildsForThisDefinition = await executeWithRetries("getBuildId", () => buildApi.getBuilds( projectId, [parseInt(definitionId)],null,null,null,null,null,null,BuildStatus.Completed,BuildResult.Succeeded,null,null,null,null,null,null, BuildQueryOrder.FinishTimeDescending,branchNameFilter), 4).catch((reason) => {
+                    reject(reason);
+                    return;
+                }); 
+
+                if (!buildsForThisDefinition || buildsForThisDefinition.length == 0){
+                    reject(tl.loc("BuildNotFound", buildId));
+                    return;
+                }
+                buildId = buildsForThisDefinition[0].id
+            } 
+
             var build = await executeWithRetries("getBuild", () => buildApi.getBuild(buildId, projectId), 4).catch((reason) => {
                 reject(reason);
                 return;

Tasks/DownloadBuildArtifacts/task.json

@@ -9,7 +9,7 @@
   "preview": true,
   "version": {
     "Major": 0,
-    "Minor": 131,
+    "Minor": 132,
     "Patch": 0
   },
   "groups": [
@@ -68,13 +68,35 @@
       "visibleRule": "buildType == specific",
       "helpMarkDown": "If checked, this build task will try to download artifacts from the triggering build. If there is no triggering build from the specified definition, it will download artifacts from the build specified in the options below."
     },
+    {
+      "name": "specificBuildId",
+      "type": "radio",
+      "label": "Download artifacts produced by",
+      "defaultValue": "specificNumber",
+      "visibleRule": "buildType == specific",
+      "required": true,
+      "options": {
+        "latest": "Latest",
+        "specificNumber": "Specific buildnumber"
+      },
+      "helpMarkDown": "Download artifacts produced by the latest build or by a specific build-number "
+    },
+    {
+      "name": "branchName",
+      "type": "string",
+      "label": "Branch name", 
+      "defaultValue": "*",
+      "visibleRule": "buildType == specific && specificBuildId == latest",
+      "required": false,
+      "helpMarkDown": "Specify to filter on branch/ref name, for example: ```refs/heads/develop```. The default pattern (\\*) will download artifacts for all builds, not filtered by branch"
+    },
     {
       "name": "buildId",
       "type": "pickList",
       "label": "Build",
       "defaultValue": "",
       "required": true,
-      "visibleRule": "buildType == specific",
+      "visibleRule": "buildType == specific && specificBuildId == specificNumber",
       "properties": {
         "EditableOptions": "True",
         "DisableManageLink": "True"