summaryrefslogtreecommitdiff
path: root/buildpipeline
diff options
context:
space:
mode:
authorEgor Chesakov <Egor.Chesakov@microsoft.com>2018-03-19 18:33:59 (GMT)
committerGitHub <noreply@github.com>2018-03-19 18:33:59 (GMT)
commit7aa346736a71ade9b9348336e1a66b69d6378778 (patch)
tree6aebbc30cc8bc9e65c67dd76b6c3b280a9e9c5c5 /buildpipeline
parentcd680d44f44269b4ed77a5a1233ac98caddf294c (diff)
downloadcoreclr-7aa346736a71ade9b9348336e1a66b69d6378778.zip
coreclr-7aa346736a71ade9b9348336e1a66b69d6378778.tar.gz
coreclr-7aa346736a71ade9b9348336e1a66b69d6378778.tar.bz2
Publish x86_arm/crossgen during Linux/arm build (#16953)
* Publish CrossCrossGen during Linux/arm build * Update DockerTag to the image that includes two rootfs-s
Diffstat (limited to 'buildpipeline')
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json16
-rw-r--r--buildpipeline/pipelines.json8
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 99f5d98..db9d38d 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 b38243f..82c2569 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",