diff options
| author | Wes Haggard <Wes.Haggard@microsoft.com> | 2018-03-26 11:02:53 -0700 |
|---|---|---|
| committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2018-03-26 11:02:53 -0700 |
| commit | af6715e91b241bfe09bfde3842f325429a35913a (patch) | |
| tree | c813e68ef5365578484400c0361e78c401f2ddaf /buildpipeline | |
| parent | b5f4d2df2e087401f2c3aab2c37021e326707915 (diff) | |
| download | coreclr-af6715e91b241bfe09bfde3842f325429a35913a.tar.gz coreclr-af6715e91b241bfe09bfde3842f325429a35913a.tar.bz2 coreclr-af6715e91b241bfe09bfde3842f325429a35913a.zip | |
Merge various restore tasks into one Sync target
There were various restore targets happening independently
when they should all be combined so the sync step can be
independent from the build step. This change merges them
together under the Sync target.
In particular this moves RestoreOptData and RestoreNETCorePlatforms
to be part of the sync step instead of being individually ran.
Pass BuildType to sync commands so optdata gets restored correctly
Diffstat (limited to 'buildpipeline')
5 files changed, 5 insertions, 5 deletions
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json index db9d38d121..78d4710c7b 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json @@ -115,7 +115,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs) ./sync.sh", + "arguments": "run --rm $(DockerCommonRunArgs) ./sync.sh -- /p:BuildType=$(PB_BuildType)", "workingFolder": "", "failOnStandardError": "false" } diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json index 76ac582f52..1b13a3c743 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json @@ -115,7 +115,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs) ./sync.sh", + "arguments": "run --rm $(DockerCommonRunArgs) ./sync.sh -- /p:BuildType=$(PB_BuildType)", "workingFolder": "", "failOnStandardError": "false" } diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Mac.json b/buildpipeline/DotNet-CoreClr-Trusted-Mac.json index 7e7c993080..a9dffd94ce 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Mac.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Mac.json @@ -35,7 +35,7 @@ }, "inputs": { "filename": "$(Agent.BuildDirectory)/s/sync.sh", - "arguments": "", + "arguments": " -- /p:BuildType=$(PB_BuildType)", "workingFolder": "", "failOnStandardError": "false" } diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json index d6584c0406..ad596adde4 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json @@ -77,7 +77,7 @@ }, "inputs": { "filename": "sync.cmd", - "arguments": "-p", + "arguments": "-p -- /p:BuildType=$(PB_BuildType)", "workingFolder": "", "failOnStandardError": "false" } diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json index ec19bea986..39b4e2a293 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json @@ -77,7 +77,7 @@ }, "inputs": { "filename": "sync.cmd", - "arguments": "-p", + "arguments": "-p -- /p:BuildType=$(PB_BuildType)", "workingFolder": "", "failOnStandardError": "false" } |