Skip to content

Add win-arm64 and linux-arm64 to CLI native archive build matrix #15599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joperezr merged 8 commits into from
Apr 1, 2026
Merged

Add win-arm64 and linux-arm64 to CLI native archive build matrix #15599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
627814b
Add win-arm64 and linux-arm64 to CLI native archive build matrix
davidfowl Mar 26, 2026
ee5c0ba
Use RID in job name to avoid duplicate names in Actions UI
davidfowl Mar 26, 2026
6343f2b
Fix RID detection to use runner.arch for arm64 support
davidfowl Mar 26, 2026
c670934
Update Grpc.Tools to 2.80.0-pre1 for linux-arm64 compatibility
Copilot Mar 29, 2026
dbb2ca3
Change Grpc.Tools version to 2.68.1
Copilot Mar 29, 2026
02909fa
Update Grpc.AspNetCore and Grpc.Net.ClientFactory to 2.67.0
Copilot Mar 29, 2026
a23b90c
Update Grpc packages: AspNetCore/ClientFactory to 2.76.0, Tools to 2.…
JamesNK Mar 31, 2026
b4e6a89
Apply suggestion from @JamesNK
JamesNK Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/build-cli-native-archives.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,22 @@ on:
targets:
description: >
JSON array of target objects to build. Each object must have 'os', 'runner', and 'rids' keys.
Defaults to all platforms (linux-x64, win-x64, osx-arm64).
Defaults to all platforms (linux-x64, linux-arm64, win-x64, win-arm64, osx-arm64).
required: false
type: string
default: >-
[
{"os": "ubuntu-latest", "runner": "8-core-ubuntu-latest", "rids": "linux-x64"},
{"os": "ubuntu-latest", "runner": "ubuntu-24.04-arm", "rids": "linux-arm64"},
{"os": "windows-latest", "runner": "windows-latest", "rids": "win-x64"},
{"os": "windows-latest", "runner": "windows-11-arm", "rids": "win-arm64"},
{"os": "macos-latest", "runner": "macos-latest", "rids": "osx-arm64"}
]

jobs:

build_cli_archives:
name: Build CLI (${{ matrix.targets.os }})
name: Build CLI (${{ matrix.targets.rids }})
runs-on: ${{ matrix.targets.runner }}
strategy:
matrix:
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,15 @@ jobs:
shell: pwsh
run: |
$runnerOs = "${{ runner.os }}"
switch ($runnerOs) {
'Linux' { $rid = 'linux-x64' }
'macOS' { $rid = 'osx-arm64' }
'Windows' { $rid = 'win-x64' }
Default { Write-Error "Unknown runner.os '$runnerOs' for RID mapping"; exit 1 }
$runnerArch = "${{ runner.arch }}"
$rid = switch ("$runnerOs-$runnerArch") {
'Linux-X64' { 'linux-x64' }
'Linux-ARM64' { 'linux-arm64' }
'Windows-X64' { 'win-x64' }
'Windows-ARM64' { 'win-arm64' }
'macOS-ARM64' { 'osx-arm64' }
'macOS-X64' { 'osx-x64' }
Default { Write-Error "Unknown runner OS/arch '$runnerOs-$runnerArch' for RID mapping"; exit 1 }
}
Write-Host "Using RID=$rid"
"RID=$rid" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ jobs:
versionOverrideArg: ${{ inputs.versionOverrideArg }}
targets: '[{"os": "ubuntu-latest", "runner": "8-core-ubuntu-latest", "rids": "linux-x64"}]'

build_cli_archive_linux_arm64:
name: Build native CLI archive (Linux ARM64)
uses: ./.github/workflows/build-cli-native-archives.yml
with:
versionOverrideArg: ${{ inputs.versionOverrideArg }}
targets: '[{"os": "ubuntu-latest", "runner": "ubuntu-24.04-arm", "rids": "linux-arm64"}]'

# Per-OS CLI archive builds produce RID-specific DCP and Dashboard NuGets.
# Split by OS so that test jobs can depend on just their platform's archive,
# allowing Linux tests to start as soon as the Linux archive completes
Expand All @@ -58,6 +65,13 @@ jobs:
versionOverrideArg: ${{ inputs.versionOverrideArg }}
targets: '[{"os": "windows-latest", "runner": "windows-latest", "rids": "win-x64"}]'

build_cli_archive_windows_arm64:
name: Build native CLI archive (Windows ARM64)
uses: ./.github/workflows/build-cli-native-archives.yml
with:
versionOverrideArg: ${{ inputs.versionOverrideArg }}
targets: '[{"os": "windows-latest", "runner": "windows-11-arm", "rids": "win-arm64"}]'

build_cli_archive_macos:
name: Build native CLI archive (macOS)
uses: ./.github/workflows/build-cli-native-archives.yml
Expand Down Expand Up @@ -226,7 +240,9 @@ jobs:
setup_for_tests,
build_packages,
build_cli_archive_linux,
build_cli_archive_linux_arm64,
build_cli_archive_windows,
build_cli_archive_windows_arm64,
build_cli_archive_macos,
extension_tests_win,
typescript_sdk_tests,
Expand Down
2 changes: 1 addition & 1 deletion playground/Stress/Stress.TelemetryService/Stress.TelemetryService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<ItemGroup>
<PackageReference Include="Grpc.Net.ClientFactory" />
<PackageReference Include="Grpc.Tools" />
<PackageReference Include="Grpc.Tools" VersionOverride="2.68.1" PrivateAssets="all" />
<PackageReference Include="Google.Protobuf" />
</ItemGroup>

Expand Down
1 change: 1 addition & 0 deletions playground/TestShop/BasketService/BasketService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" />
<PackageReference Include="Grpc.Tools" VersionOverride="2.68.1" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 1 addition & 4 deletions playground/TestShop/MyFrontend/MyFrontend.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@
<PackageReference Include="Yarp.ReverseProxy" />
<PackageReference Include="Google.Protobuf" />
<PackageReference Include="Grpc.Net.ClientFactory" />
<PackageReference Include="Grpc.Tools">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Grpc.Tools" VersionOverride="2.68.1" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Aspire.Dashboard/Aspire.Dashboard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@

<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" />
<PackageReference Include="Grpc.Tools" VersionOverride="2.68.1" PrivateAssets="all" />
<PackageReference Include="Humanizer.Core" />
<PackageReference Include="Microsoft.Extensions.AI" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
Expand Down
1 change: 1 addition & 0 deletions src/Aspire.Hosting/Aspire.Hosting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@

<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" />
<PackageReference Include="Grpc.Tools" VersionOverride="2.68.1" PrivateAssets="all" />
<PackageReference Include="KubernetesClient" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
<PackageReference Include="ModelContextProtocol" />
Expand Down
2 changes: 1 addition & 1 deletion tests/Aspire.Dashboard.Tests/Aspire.Dashboard.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Grpc.Tools" />
<PackageReference Include="Grpc.Tools" VersionOverride="2.68.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.DotNet.XUnitV3Extensions" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
</ItemGroup>
Expand Down
Loading