diff options
author | Wes Haggard <weshaggard@users.noreply.github.com> | 2018-04-19 14:36:48 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-19 14:36:48 -0700 |
commit | e1bdc572021683cb357a21d58693093217828c38 (patch) | |
tree | 15f3198674f8a00a9168bcd46c98a4e7346695f7 | |
parent | 3b3ef2add7b99d8acc3f0a156527d45a6f9e295b (diff) | |
parent | f9e36f07e0a7fb2f9b7ccb14cf081459962c8453 (diff) | |
download | coreclr-e1bdc572021683cb357a21d58693093217828c38.tar.gz coreclr-e1bdc572021683cb357a21d58693093217828c38.tar.bz2 coreclr-e1bdc572021683cb357a21d58693093217828c38.zip |
Merge pull request #17675 from weshaggard/addlinuxmusl21
[release/2.1] Add linux-musl build leg
-rw-r--r-- | buildpipeline/DotNet-CoreClr-Trusted-Linux.json | 11 | ||||
-rw-r--r-- | buildpipeline/pipelines.json | 19 | ||||
-rw-r--r-- | src/.nuget/dir.props | 17 |
3 files changed, 36 insertions, 11 deletions
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json index 54065c0aab..e60215750f 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 2360c3d530..e83e2e19b7 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": { diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props index 224c6bf1be..253adeb3f4 100644 --- a/src/.nuget/dir.props +++ b/src/.nuget/dir.props @@ -5,7 +5,7 @@ <PropertyGroup> <!-- defined in buildtools packaging.targets, but we need this before targets are imported --> <PackagePlatform>AnyCPU</PackagePlatform> - + <!-- build the transport package which includes product and symbols in addition to standard packages --> <CreatePackedPackage Condition="'$(CreatePackedPackage)' == ''">true</CreatePackedPackage> @@ -26,8 +26,8 @@ <SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">Windows_NT;OSX;Android;Linux</SupportedPackageOSGroups> <SupportedPackageOSGroups>;$(SupportedPackageOSGroups);</SupportedPackageOSGroups> - <!-- Identify OS family based upon the RuntimeOS, which could be distro specific (e.g. osx.10.12) or - portable (e.g. osx). + <!-- Identify OS family based upon the RuntimeOS, which could be distro specific (e.g. osx.10.12) or + portable (e.g. osx). --> <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex> <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily> @@ -46,7 +46,7 @@ <_isSupportedOSGroup Condition="!$(SupportedPackageOSGroups.Contains(';$(_derivedPackageTargetOSGroup);'))">false</_isSupportedOSGroup> </PropertyGroup> - <!-- _packageTargetOSGroup is used to control the runtime package imports, don't import runtime package targets for + <!-- _packageTargetOSGroup is used to control the runtime package imports, don't import runtime package targets for an unsupported OS Group --> <PropertyGroup Condition="'$(PackageTargetRuntime)' != '' and '$(_isSupportedOSGroup)' == 'true'"> <!-- Android will use Linux package definitions --> @@ -65,6 +65,12 @@ <Choose> <When Condition="'$(PackageRID)' != ''" /> + <When Condition="'$(OutputRID)' != ''"> + <PropertyGroup> + <!-- If OutputRID is explicitly set use that as the PackageRID --> + <PackageRID>$(OutputRID)</PackageRID> + </PropertyGroup> + </When> <When Condition="'$(_runtimeOSFamily)' == 'win'"> <PropertyGroup> <!-- Note: Windows builds are always portable (-PortableBuild=false is ignored) --> @@ -127,6 +133,7 @@ <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';Linux;'))"> <OfficialBuildRID Include="linux-x64" /> + <OfficialBuildRID Include="linux-musl-x64" /> <OfficialBuildRID Include="rhel.6-x64" /> <OfficialBuildRID Include="alpine.3.6-x64" /> <OfficialBuildRID Include="linux-arm"> @@ -155,7 +162,7 @@ </OfficialBuildRID> </ItemGroup> <ItemGroup> - <!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set, but + <!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set, but don't build the RID-specific package if we're in an unsupported os family --> <BuildRID Include="@(OfficialBuildRID)" Exclude="$(PackageRID)"/> <BuildRID Include="$(PackageRID)" |