Skip to content

Commit

Permalink
Changing downloadPath to targetPath and couple of other fields to mat…
Browse files Browse the repository at this point in the history
…ch V0 (#10059) (#10214)

* Adding aliases to targetpath

* Chaning patch for Download Pipeline Artifact V1 task

* PR comments

* Fixing version for PublishPipelineArtifact task as well

* Version fix
  • Loading branch information
fadnavistanmay authored and arunkm committed Apr 25, 2019
1 parent 53f8726 commit 6119c2e
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"loc.input.label.buildVersionToDownload": "Build version to download",
"loc.input.label.branchName": "Branch name",
"loc.input.help.branchName": "Specify to filter on branch/ref name, for example: ```refs/heads/develop```.",
"loc.input.label.buildId": "Build",
"loc.input.help.buildId": "The build from which to download the artifacts.",
"loc.input.label.pipelineId": "Pipeline",
"loc.input.help.pipelineId": "The pipeline from which to download the artifacts.",
"loc.input.label.tags": "Build Tags",
"loc.input.help.tags": "A comma-delimited list of tags. Only builds with these tags will be returned.",
"loc.input.label.artifactName": "Artifact name",
"loc.input.help.artifactName": "The name of the artifact to download.",
"loc.input.label.itemPattern": "Matching pattern",
"loc.input.help.itemPattern": "Specify files to be downloaded as multi line minimatch pattern. [More Information](https://aka.ms/minimatchexamples).</p>",
"loc.input.label.downloadPath": "Destination directory",
"loc.input.help.downloadPath": "Path on the agent machine where the artifacts will be downloaded."
"loc.input.label.targetPath": "Destination directory",
"loc.input.help.targetPath": "Path on the agent machine where the artifacts will be downloaded."
}
18 changes: 12 additions & 6 deletions Tasks/DownloadPipelineArtifactV1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"version": {
"Major": 1,
"Minor": 1,
"Patch": 0
"Patch": 1
},
"groups": [],
"demands": [],
"preview": true,
"minimumAgentVersion": "2.147.0",
"minimumAgentVersion": "2.150.0",
"inputs": [
{
"name": "buildType",
Expand Down Expand Up @@ -90,7 +90,10 @@
"helpMarkDown": "Specify to filter on branch/ref name, for example: ```refs/heads/develop```."
},
{
"name": "buildId",
"name": "pipelineId",
"aliases": [
"buildId"
],
"type": "pickList",
"label": "Build",
"defaultValue": "",
Expand Down Expand Up @@ -136,7 +139,10 @@
"helpMarkDown": "Specify files to be downloaded as multi line minimatch pattern. [More Information](https://aka.ms/minimatchexamples).</p>"
},
{
"name": "downloadPath",
"name": "targetPath",
"aliases": [
"downloadPath"
],
"type": "string",
"label": "Destination directory",
"defaultValue": "$(System.ArtifactsDirectory)",
Expand Down Expand Up @@ -171,7 +177,7 @@
},
{
"endpointId": "tfs:teamfoundation",
"target": "buildId",
"target": "pipelineId",
"endpointUrl": "{{endpoint.url}}/{{project}}/_apis/build/builds?definitions={{definition}}&resultFilter=succeeded,partiallySucceeded&$top=200",
"resultSelector": "jsonpath:$.value[*]",
"parameters": {
Expand All @@ -195,7 +201,7 @@
"instanceNameFormat": "Download Pipeline Artifact",
"execution": {
"AgentPlugin": {
"target": "Agent.Plugins.PipelineArtifact.DownloadPipelineArtifactTaskV1_1_0, Agent.Plugins"
"target": "Agent.Plugins.PipelineArtifact.DownloadPipelineArtifactTaskV1_1_1, Agent.Plugins"
}
},
"messages": {}
Expand Down
26 changes: 16 additions & 10 deletions Tasks/DownloadPipelineArtifactV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"version": {
"Major": 1,
"Minor": 1,
"Patch": 0
"Patch": 1
},
"groups": [],
"demands": [],
"preview": true,
"minimumAgentVersion": "2.147.0",
"minimumAgentVersion": "2.150.0",
"inputs": [
{
"name": "buildType",
Expand Down Expand Up @@ -90,17 +90,20 @@
"helpMarkDown": "ms-resource:loc.input.help.branchName"
},
{
"name": "buildId",
"name": "pipelineId",
"aliases": [
"buildId"
],
"type": "pickList",
"label": "ms-resource:loc.input.label.buildId",
"label": "ms-resource:loc.input.label.pipelineId",
"defaultValue": "",
"required": true,
"visibleRule": "buildType == specific && buildVersionToDownload == specific",
"properties": {
"EditableOptions": "True",
"DisableManageLink": "True"
},
"helpMarkDown": "ms-resource:loc.input.help.buildId"
"helpMarkDown": "ms-resource:loc.input.help.pipelineId"
},
{
"name": "tags",
Expand Down Expand Up @@ -136,12 +139,15 @@
"helpMarkDown": "ms-resource:loc.input.help.itemPattern"
},
{
"name": "downloadPath",
"name": "targetPath",
"aliases": [
"downloadPath"
],
"type": "string",
"label": "ms-resource:loc.input.label.downloadPath",
"label": "ms-resource:loc.input.label.targetPath",
"defaultValue": "$(System.ArtifactsDirectory)",
"required": true,
"helpMarkDown": "ms-resource:loc.input.help.downloadPath"
"helpMarkDown": "ms-resource:loc.input.help.targetPath"
}
],
"dataSourceBindings": [
Expand Down Expand Up @@ -171,7 +177,7 @@
},
{
"endpointId": "tfs:teamfoundation",
"target": "buildId",
"target": "pipelineId",
"endpointUrl": "{{endpoint.url}}/{{project}}/_apis/build/builds?definitions={{definition}}&resultFilter=succeeded,partiallySucceeded&$top=200",
"resultSelector": "jsonpath:$.value[*]",
"parameters": {
Expand All @@ -195,7 +201,7 @@
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
"execution": {
"AgentPlugin": {
"target": "Agent.Plugins.PipelineArtifact.DownloadPipelineArtifactTaskV1_1_0, Agent.Plugins"
"target": "Agent.Plugins.PipelineArtifact.DownloadPipelineArtifactTaskV1_1_1, Agent.Plugins"
}
},
"messages": {}
Expand Down

0 comments on commit 6119c2e

Please sign in to comment.