Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 123df7f

Browse files
authored
Follow-up PR for Linux-arm; CLI:master (#8797)
* Fix the badge for Linux-arm. * Add comment for the LZMA; turn off displaying of test results for arm*
1 parent a54f0ff commit 123df7f

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

build/BuildDefaults.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<PropertyGroup>
33
<CLITargets Condition=" '$(CLITargets)' == '' ">Prepare;Compile;Test;Package;Publish</CLITargets>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<!-- Currently, 'arm*' SDK's do not include the LZMA for performance upon extraction of the NuGet archive. -->
6+
<!-- https://github.com/dotnet/cli/issues/8800 -->
57
<IncludeNuGetPackageArchive Condition=" $(Architecture.StartsWith('arm')) ">false</IncludeNuGetPackageArchive>
68
<IncludeNuGetPackageArchive Condition=" '$(IncludeNuGetPackageArchive)' == '' ">true</IncludeNuGetPackageArchive>
79
<SkipBuildingInstallers Condition=" '$(SkipBuildingInstallers)' == '' AND ($(Rid.StartsWith('rhel.6')) OR $(Rid.StartsWith('alpine.3.6')))">true</SkipBuildingInstallers>

build/publish/Badge.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<VersionBadgeMoniker>$(OSName)_$(Architecture)</VersionBadgeMoniker>
3333
<VersionBadgeMoniker Condition=" '$(Rid)' == 'rhel.6-x64' ">rhel.6_x64</VersionBadgeMoniker>
3434
<VersionBadgeMoniker Condition=" '$(Rid)' == 'alpine.3.6-x64' ">alpine.3.6_x64</VersionBadgeMoniker>
35-
<VersionBadgeMoniker Condition=" '$(IslinuxPortable)' == 'true' ">linux_x64</VersionBadgeMoniker>
35+
<VersionBadgeMoniker Condition=" '$(IslinuxPortable)' == 'true' ">linux_$(Architecture)</VersionBadgeMoniker>
3636
<VersionBadgeMoniker Condition=" '$(IsBuildingAndPublishingAllLinuxDistrosNativeInstallers)' == 'true' ">all_linux_distros_native_installer</VersionBadgeMoniker>
3737

3838
<VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>

netci.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ set DOTNET_CLI_UI_LANGUAGE=es
8080

8181
Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, 'latest-or-auto')
8282
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
83-
Utilities.addMSTestResults(newJob, '**/*.trx')
83+
// ARM CI runs are build only.
84+
if (architecture != 'arm') {
85+
Utilities.addMSTestResults(newJob, '**/*.trx')
86+
}
8487
Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build")
8588
}
8689

0 commit comments

Comments
 (0)