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

Commit ed35c63

Browse files
committed
[Arm64] Enable arm64 cli builds
1 parent 1e2e813 commit ed35c63

File tree

5 files changed

+17
-9
lines changed

5 files changed

+17
-9
lines changed

README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ This project has adopted the code of conduct defined by the [Contributor Covenan
2323
Build Status
2424
------------
2525

26-
|Windows x64|Windows x86|macOS|Linux x64 Archive|Linux arm Archive|Linux Native Installers|RHEL 6 Archive|Alpine 3.6 Archive|
27-
|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|
28-
|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][linux-build-badge]][linux-build]|[![][linux-arm-build-badge]][linux-arm-build]|[![][linuxnative-build-badge]][linuxnative-build]|[![][rhel6-build-badge]][rhel6-build]|[![][alpine3.6-build-badge]][alpine3.6-build]|
26+
|Windows x64|Windows x86|macOS|Linux x64 Archive|Linux arm Archive|Linux arm64 Archive|Linux Native Installers|RHEL 6 Archive|Alpine 3.6 Archive|
27+
|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|
28+
|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][linux-build-badge]][linux-build]|[![][linux-arm-build-badge]][linux-arm-build]|[![][linux-arm64-build-badge]][linux-arm64-build]|[![][linuxnative-build-badge]][linuxnative-build]|[![][rhel6-build-badge]][rhel6-build]|[![][alpine3.6-build-badge]][alpine3.6-build]|
2929

3030
[win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6902/badge
3131
[win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6902
@@ -42,6 +42,9 @@ Build Status
4242
[linux-arm-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/8721/badge
4343
[linux-arm-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=8721
4444

45+
[linux-arm64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/8817/badge
46+
[linux-arm64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=8817
47+
4548
[linuxnative-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/7254/badge
4649
[linuxnative-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=7254
4750

@@ -69,6 +72,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/
6972
| **macOS** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]<br>[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] |
7073
| **Linux x64** | [DEB Installer][linux-DEB-installer] - [Checksum][linux-DEB-installer-checksum]<br>[RPM Installer][linux-RPM-installer] - [Checksum][linux-RPM-installer-checksum]<br>_see installer note below_<sup>1</sup><br>[tar.gz][linux-targz] - [Checksum][linux-targz-checksum] |
7174
| **Linux arm** | [tar.gz][linux-arm-targz] - [Checksum][linux-arm-targz-checksum] |
75+
| **Linux arm64** | [tar.gz][linux-arm64-targz] - [Checksum][linux-arm64-targz-checksum] |
7276
| **RHEL 6** | [tar.gz][rhel-6-targz] - [Checksum][rhel-6-targz-checksum] |
7377
| **Alpine 3.6** | [tar.gz][alpine-3.6-targz] - [Checksum][alpine-3.6-targz-checksum] |
7478

@@ -107,6 +111,9 @@ Reference notes:
107111
[linux-arm-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm.tar.gz
108112
[linux-arm-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm.tar.gz.sha
109113

114+
[linux-arm64-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm64.tar.gz
115+
[linux-arm64-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm64.tar.gz.sha
116+
110117
[linux-DEB-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.deb
111118
[linux-DEB-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.deb.sha
112119

build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ public override bool Execute()
5656
{ "rhel.6_x64", false },
5757
{ "alpine.3.6_x64", false },
5858
{ "all_linux_distros_native_installer", false},
59-
{ "linux_arm", false}
59+
{ "linux_arm", false},
60+
{ "linux_arm64", false}
6061
};
6162

6263
if (!badges.ContainsKey(VersionBadgeMoniker))

netci.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def project = GithubProject
99
def branch = GithubBranchName
1010
def isPR = true
1111

12-
def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT_ES:x64:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'RHEL6:x64:Debug', 'Alpine3.6:x64:Debug', 'Linux:arm:Debug']
12+
def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT_ES:x64:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'RHEL6:x64:Debug', 'Alpine3.6:x64:Debug', 'Linux:arm:Debug', 'Linux:arm64:Debug']
1313

1414
def static getBuildJobName(def configuration, def os, def architecture) {
1515
return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase()
@@ -44,7 +44,7 @@ set DOTNET_CLI_UI_LANGUAGE=es
4444
}
4545
else if (os == 'Linux') {
4646
osUsedForMachineAffinity = 'Ubuntu16.04';
47-
if (architecture == 'arm') {
47+
if ((architecture == 'arm') || (architecture == 'arm64')) {
4848
buildCommand = "./build.sh --linux-portable --skip-prereqs --architecture ${architecture} --configuration ${configuration} --targets Default /p:CLIBUILD_SKIP_TESTS=true"
4949
}
5050
else {
@@ -81,7 +81,7 @@ set DOTNET_CLI_UI_LANGUAGE=es
8181
Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, 'latest-or-auto')
8282
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
8383
// ARM CI runs are build only.
84-
if (architecture != 'arm') {
84+
if ((architecture != 'arm') && (architecture != 'arm64')) {
8585
Utilities.addMSTestResults(newJob, '**/*.trx')
8686
}
8787
Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build")

run-build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if($Help)
2020
Write-Output ""
2121
Write-Output "Options:"
2222
Write-Output " -Configuration <CONFIGURATION> Build the specified Configuration (Debug or Release, default: Debug)"
23-
Write-Output " -Architecture <ARCHITECTURE> Build the specified architecture (x64, x86, or arm , default: x64)"
23+
Write-Output " -Architecture <ARCHITECTURE> Build the specified architecture (x64, x86, arm, or arm64 , default: x64)"
2424
Write-Output " -NoPackage Skip packaging targets"
2525
Write-Output " -NoBuild Skip building the product"
2626
Write-Output " -Help Display this help message"

run-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ while [[ $# > 0 ]]; do
107107
echo ""
108108
echo "Options:"
109109
echo " --configuration <CONFIGURATION> Build the specified Configuration (Debug or Release, default: Debug)"
110-
echo " --architecture <ARCHITECTURE> Build the specified architecture (x64 or arm , default: x64)"
110+
echo " --architecture <ARCHITECTURE> Build the specified architecture (x64, arm or arm64 , default: x64)"
111111
echo " --skip-prereqs Skip checks for pre-reqs in dotnet_install"
112112
echo " --nopackage Skip packaging targets"
113113
echo " --nobuild Skip building, showing the command that would be used to build"

0 commit comments

Comments
 (0)