summaryrefslogtreecommitdiff
path: root/buildpipeline
diff options
context:
space:
mode:
authorWes Haggard <weshaggard@users.noreply.github.com>2018-04-19 21:36:48 (GMT)
committerGitHub <noreply@github.com>2018-04-19 21:36:48 (GMT)
commite1bdc572021683cb357a21d58693093217828c38 (patch)
tree15f3198674f8a00a9168bcd46c98a4e7346695f7 /buildpipeline
parent3b3ef2add7b99d8acc3f0a156527d45a6f9e295b (diff)
parentf9e36f07e0a7fb2f9b7ccb14cf081459962c8453 (diff)
downloadcoreclr-e1bdc572021683cb357a21d58693093217828c38.zip
coreclr-e1bdc572021683cb357a21d58693093217828c38.tar.gz
coreclr-e1bdc572021683cb357a21d58693093217828c38.tar.bz2
Merge pull request #17675 from weshaggard/addlinuxmusl21
[release/2.1] Add linux-musl build leg
Diffstat (limited to 'buildpipeline')
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Linux.json11
-rw-r--r--buildpipeline/pipelines.json19
2 files changed, 24 insertions, 6 deletions
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
index 54065c0..e602157 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
@@ -179,7 +179,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) $(PB_AdditionalBuildArgs) -- /p:OfficialBuildId=$(OfficialBuildId)",
+ "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) $(PB_AdditionalBuildArgs) -- /p:OutputRID=$(PB_OutputRID) /p:OfficialBuildId=$(OfficialBuildId)",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -199,7 +199,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true",
+ "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -219,7 +219,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishSymbols -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg /p:OverwriteOnPublish=true",
+ "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -PublishSymbols -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg /p:OverwriteOnPublish=true",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -239,7 +239,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishTestNativeBins -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/TestNativeBins/$(Rid)-$(Architecture) /p:OverwriteOnPublish=true",
+ "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -PublishTestNativeBins -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/TestNativeBins/$(Rid)-$(Architecture) /p:OverwriteOnPublish=true",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -497,6 +497,9 @@
},
"VsoRepositoryName": {
"value": "DotNet-CoreCLR-Trusted"
+ },
+ "PB_OutputRID": {
+ "value": ""
}
},
"demands": [
diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json
index 2360c3d..e83e2e1 100644
--- a/buildpipeline/pipelines.json
+++ b/buildpipeline/pipelines.json
@@ -41,7 +41,7 @@
"Architecture": "x64",
"PB_BuildType": null
}
- },
+ },
{
"Name": "DotNet-CoreClr-Trusted-Linux",
"Parameters": {
@@ -55,7 +55,22 @@
"Architecture": "x64",
"PB_BuildType": null
}
- },
+ },
+ {
+ "Name": "DotNet-CoreClr-Trusted-Linux",
+ "Parameters": {
+ "DockerTag": "alpine-3.6-3148f11-20171119021156",
+ "Rid": "linux-musl",
+ "PB_OutputRID": "linux-musl-x64",
+ "PB_AdditionalBuildArgs": "-portablebuild=false"
+ },
+ "ReportingParameters": {
+ "OperatingSystem": "Linux-musl",
+ "Type": "build/product/",
+ "Architecture": "x64",
+ "PB_BuildType": null
+ }
+ },
{
"Name": "DotNet-CoreClr-Trusted-Mac",
"Parameters": {