Skip to content

Enable gRPC tests on MacOS 12 #53186

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
merged 2 commits into from
Jan 10, 2024
Merged

Enable gRPC tests on MacOS 12 #53186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a3d08e
Enable gRPC on MacOS 12
JamesNK Jan 6, 2024
59f8de5
Update Helix to use MacOS 12
JamesNK Jan 9, 2024
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
2 changes: 1 addition & 1 deletion eng/targets/Helix.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<HelixAvailableTargetQueue Include="$(HelixQueueArmDebian12)" Platform="Linux" />

<!-- Mac -->
<HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="OSX" />
<HelixAvailableTargetQueue Include="OSX.1200.Amd64.Open" Platform="OSX" />

<!-- Windows -->
<HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" />
Expand Down
9 changes: 0 additions & 9 deletions src/Grpc/Interop/Directory.Build.props
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/Grpc/JsonTranscoding/perf/Directory.Build.props
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ...icrosoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TieredCompilation>false</TieredCompilation>
<DefineConstants>$(DefineConstants);IS_BENCHMARKS</DefineConstants>
<!-- TODO: Remove when Grpc.Tools on MacOS 11 is fixed. See https://github.com/grpc/grpc/issues/32558 -->
<SkipMicrobenchmarksValidation>true</SkipMicrobenchmarksValidation>
</PropertyGroup>

<ItemGroup>
Expand Down
9 changes: 0 additions & 9 deletions src/Grpc/JsonTranscoding/test/Directory.Build.props
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,14 @@ public ITestOutputHelper Output
}
}

// TODO (https://github.com/dotnet/aspnetcore/issues/47336): Don't skip on macos 11
[ConditionalFact]
[SkipOnHelix("Not supported queues", Queues = "OSX.1100.Amd64.Open;windows.11.arm64.open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
[SkipOnHelix("Not supported queues", Queues = "windows.11.arm64.open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")] // protoc doesn't support Alpine. Note that the issue was closed with a workaround which isn't applied to our OS image.
public async Task GrpcTemplate()
{
await GrpcTemplateCore();
}

// TODO (https://github.com/dotnet/aspnetcore/issues/47336): Don't skip on macos 11
[ConditionalFact]
[SkipOnHelix("Not supported queues", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")] // protoc doesn't support Alpine. Note that the issue was closed with a workaround which isn't applied to our OS image.
Expand All @@ -52,16 +50,14 @@ public async Task GrpcTemplateNativeAot()
await GrpcTemplateCore(args: new[] { ArgConstants.PublishNativeAot });
}

// TODO (https://github.com/dotnet/aspnetcore/issues/47336): Don't skip on macos 11
[ConditionalFact]
[SkipOnHelix("Not supported queues", Queues = "OSX.1100.Amd64.Open;windows.11.arm64.open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
[SkipOnHelix("Not supported queues", Queues = "windows.11.arm64.open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")] // protoc doesn't support Alpine. Note that the issue was closed with a workaround which isn't applied to our OS image.
public async Task GrpcTemplateProgramMain()
{
await GrpcTemplateCore(args: new[] { ArgConstants.UseProgramMain });
}

// TODO (https://github.com/dotnet/aspnetcore/issues/47336): Don't skip on macos 11
[ConditionalFact]
[SkipOnHelix("Not supported queues", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")] // protoc doesn't support Alpine. Note that the issue was closed with a workaround which isn't applied to our OS image.
Expand Down