diff options
Diffstat (limited to 'buildpipeline')
| -rw-r--r-- | buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json | 16 | ||||
| -rw-r--r-- | buildpipeline/pipelines.json | 8 |
2 files changed, 20 insertions, 4 deletions
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json index 99f5d98e48..db9d38d121 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json @@ -155,7 +155,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm -e ROOTFS_DIR $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget cross -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"", + "arguments": "run --rm -e ROOTFS_DIR=$(ROOTFS_DIR) -e CAC_ROOTFS_DIR=$(CAC_ROOTFS_DIR) $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget cross $(CrossArchBuildArgs) -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"", "workingFolder": "", "failOnStandardError": "false" } @@ -175,7 +175,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -- /p:OfficialBuildId=$(OfficialBuildId)", + "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) $(CrossArchBuildPackagesArgs) -- /p:OfficialBuildId=$(OfficialBuildId)", "workingFolder": "", "failOnStandardError": "false" } @@ -479,6 +479,14 @@ "Architecture": { "value": "arm" }, + "CrossArchBuildArgs": { + "value": "", + "allowOverride": true + }, + "CrossArchBuildPackagesArgs": { + "value": "", + "allowOverride": true + }, "CommitToCheckout": { "value": "HEAD", "allowOverride": true @@ -489,6 +497,10 @@ "ROOTFS_DIR": { "value": "/crossrootfs/$(Architecture)" }, + "CAC_ROOTFS_DIR": { + "value": "", + "allowOverride": true + }, "DockerVolumeName": { "value": "coreclr-cross-$(Build.BuildId)" }, diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json index b38243fdcc..82c2569a51 100644 --- a/buildpipeline/pipelines.json +++ b/buildpipeline/pipelines.json @@ -130,9 +130,13 @@ { "Name": "DotNet-CoreClr-Trusted-Linux-Crossbuild", "Parameters": { - "DockerTag": "ubuntu-14.04-cross-0cd4667-20170319080304", + "DockerTag": "ubuntu-14.04-cross-e435274-20180317125300", "Architecture": "arm", - "Rid": "linux" + "Rid": "linux", + "CrossArchitecture": "x86", + "CrossArchBuildArgs": "crosscomponent", + "CrossArchBuildPackagesArgs": "-__DoCrossArchBuild=1", + "CAC_ROOTFS_DIR": "/crossrootfs/$(CrossArchitecture)" }, "ReportingParameters": { "OperatingSystem": "Linux", |