Skip to content

Commit 2d90d71

Browse files
[NativeAOT-LLVM] Add linux-arm64 to official build (#3121)
* Fix a potential issue with remove-duplicate-packages.ps1 Account for the case where the "(build) host RID" != "host target RID". Currently not an issue since we don't have e. g. win-arm64 (that would still be built on win-x64). * Add linux-arm64 to official build
1 parent c7f9549 commit 2d90d71

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

eng/pipelines/runtimelab-official.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ extends:
3939
- browser_wasm_win
4040
- wasi_wasm_win
4141
- browser_wasm_linux_x64_naot_llvm
42+
- browser_wasm_linux_arm64_naot_llvm
4243
jobParameters:
4344
templatePath: 'templates-official'
4445
timeoutInMinutes: 300

eng/pipelines/runtimelab/remove-duplicate-packages.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
[CmdletBinding(PositionalBinding=$false)]
88
param(
99
[string]$Config,
10+
[string]$HostArch,
1011
[string]$TargetOS,
1112
[string]$TargetArch
1213
)
@@ -27,7 +28,8 @@ if (!(Test-Path $PackagesPath))
2728
exit
2829
}
2930

30-
$HostRid = [Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier
31+
$BuildHostRid = [Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier
32+
$HostRid = $BuildHostRid.Substring(0, $BuildHostRid.LastIndexOf("-")) + "-" + $HostArch
3133
$PublishTargetPackages = $HostRid -eq "win-x64"
3234
if (!$PublishTargetPackages)
3335
{

eng/pipelines/runtimelab/runtimelab-post-build-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ steps:
5353
- script: $(Build.SourcesDirectory)/build$(scriptExt) libs.tests -test -a ${{ parameters.archType }} -os ${{ parameters.osGroup }} -lc ${{ parameters.librariesConfiguration }} -rc $(buildConfigUpper) /p:TestNativeAot=true /p:RunSmokeTestsOnly=true
5454
displayName: Build and run WebAssembly libraries tests
5555

56-
- script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/remove-duplicate-packages.ps1 -Config $(_BuildConfig) -TargetOS ${{ parameters.osGroup }} -TargetArch ${{ parameters.archType }}
56+
- script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/remove-duplicate-packages.ps1 -Config $(_BuildConfig) -HostArch $(hostedTargetArch) -TargetOS ${{ parameters.osGroup }} -TargetArch ${{ parameters.archType }}
5757
displayName: Remove duplicate packages before publishing
5858

5959
# Upload unsigned artifacts

0 commit comments

Comments
 (0)