Skip to content

Commit ca45f3a

Browse files
weshaggardweshaggard
committed
Add linux-musl build leg
1 parent c127548 commit ca45f3a

File tree

3 files changed

+36
-11
lines changed

3 files changed

+36
-11
lines changed

Diff for: ‎buildpipeline/DotNet-CoreClr-Trusted-Linux.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
},
180180
"inputs": {
181181
"filename": "docker",
182-
"arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) $(PB_AdditionalBuildArgs) -- /p:OfficialBuildId=$(OfficialBuildId)",
182+
"arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) $(PB_AdditionalBuildArgs) -- /p:OutputRID=$(PB_OutputRID) /p:OfficialBuildId=$(OfficialBuildId)",
183183
"workingFolder": "",
184184
"failOnStandardError": "false"
185185
}
@@ -199,7 +199,7 @@
199199
},
200200
"inputs": {
201201
"filename": "docker",
202-
"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",
202+
"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",
203203
"workingFolder": "",
204204
"failOnStandardError": "false"
205205
}
@@ -219,7 +219,7 @@
219219
},
220220
"inputs": {
221221
"filename": "docker",
222-
"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",
222+
"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",
223223
"workingFolder": "",
224224
"failOnStandardError": "false"
225225
}
@@ -239,7 +239,7 @@
239239
},
240240
"inputs": {
241241
"filename": "docker",
242-
"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",
242+
"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",
243243
"workingFolder": "",
244244
"failOnStandardError": "false"
245245
}
@@ -497,6 +497,9 @@
497497
},
498498
"VsoRepositoryName": {
499499
"value": "DotNet-CoreCLR-Trusted"
500+
},
501+
"PB_OutputRID": {
502+
"value": ""
500503
}
501504
},
502505
"demands": [

Diff for: ‎buildpipeline/pipelines.json

+17-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"Architecture": "x64",
4242
"PB_BuildType": null
4343
}
44-
},
44+
},
4545
{
4646
"Name": "DotNet-CoreClr-Trusted-Linux",
4747
"Parameters": {
@@ -55,7 +55,22 @@
5555
"Architecture": "x64",
5656
"PB_BuildType": null
5757
}
58-
},
58+
},
59+
{
60+
"Name": "DotNet-CoreClr-Trusted-Linux",
61+
"Parameters": {
62+
"DockerTag": "alpine-3.6-3148f11-20171119021156",
63+
"Rid": "linux-musl",
64+
"PB_OutputRID": "linux-musl",
65+
"PB_AdditionalBuildArgs": "-portablebuild=false"
66+
},
67+
"ReportingParameters": {
68+
"OperatingSystem": "Linux-musl",
69+
"Type": "build/product/",
70+
"Architecture": "x64",
71+
"PB_BuildType": null
72+
}
73+
},
5974
{
6075
"Name": "DotNet-CoreClr-Trusted-Mac",
6176
"Parameters": {

Diff for: ‎src/.nuget/dir.props

+12-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<!-- defined in buildtools packaging.targets, but we need this before targets are imported -->
77
<PackagePlatform>AnyCPU</PackagePlatform>
8-
8+
99
<!-- build the transport package which includes product and symbols in addition to standard packages -->
1010
<CreatePackedPackage Condition="'$(CreatePackedPackage)' == ''">true</CreatePackedPackage>
1111

@@ -26,8 +26,8 @@
2626
<SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">Windows_NT;OSX;Android;Linux</SupportedPackageOSGroups>
2727
<SupportedPackageOSGroups>;$(SupportedPackageOSGroups);</SupportedPackageOSGroups>
2828

29-
<!-- Identify OS family based upon the RuntimeOS, which could be distro specific (e.g. osx.10.12) or
30-
portable (e.g. osx).
29+
<!-- Identify OS family based upon the RuntimeOS, which could be distro specific (e.g. osx.10.12) or
30+
portable (e.g. osx).
3131
-->
3232
<_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex>
3333
<_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily>
@@ -46,7 +46,7 @@
4646
<_isSupportedOSGroup Condition="!$(SupportedPackageOSGroups.Contains(';$(_derivedPackageTargetOSGroup);'))">false</_isSupportedOSGroup>
4747
</PropertyGroup>
4848

49-
<!-- _packageTargetOSGroup is used to control the runtime package imports, don't import runtime package targets for
49+
<!-- _packageTargetOSGroup is used to control the runtime package imports, don't import runtime package targets for
5050
an unsupported OS Group -->
5151
<PropertyGroup Condition="'$(PackageTargetRuntime)' != '' and '$(_isSupportedOSGroup)' == 'true'">
5252
<!-- Android will use Linux package definitions -->
@@ -65,6 +65,12 @@
6565

6666
<Choose>
6767
<When Condition="'$(PackageRID)' != ''" />
68+
<When Condition="'$(OutputRID)' != ''">
69+
<PropertyGroup>
70+
<!-- If OutputRID is explicitly set use that as the PackageRID -->
71+
<PackageRID>$(OutputRID)</PackageRID>
72+
</PropertyGroup>
73+
</When>
6874
<When Condition="'$(_runtimeOSFamily)' == 'win'">
6975
<PropertyGroup>
7076
<!-- Note: Windows builds are always portable (-PortableBuild=false is ignored) -->
@@ -127,6 +133,7 @@
127133

128134
<ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';Linux;'))">
129135
<OfficialBuildRID Include="linux-x64" />
136+
<OfficialBuildRID Include="linux-musl-x64" />
130137
<OfficialBuildRID Include="rhel.6-x64" />
131138
<OfficialBuildRID Include="alpine.3.6-x64" />
132139
<OfficialBuildRID Include="linux-arm">
@@ -155,7 +162,7 @@
155162
</OfficialBuildRID>
156163
</ItemGroup>
157164
<ItemGroup>
158-
<!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set, but
165+
<!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set, but
159166
don't build the RID-specific package if we're in an unsupported os family -->
160167
<BuildRID Include="@(OfficialBuildRID)" Exclude="$(PackageRID)"/>
161168
<BuildRID Include="$(PackageRID)"

0 commit comments

Comments
 (0)