Skip to content

Use osx.13.arm64.open queue for osx testing #112647

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 3 commits into from
Feb 27, 2025
Merged

Use osx.13.arm64.open queue for osx testing #112647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74f1a7b
Use osx.13.arm64.open queue for osx testing
MichalStrehovsky Feb 18, 2025
49a7a62
Update tests.proj
MichalStrehovsky Feb 27, 2025
05b5936
Merge branch 'main' into MichalStrehovsky-patch-6
MichalStrehovsky Feb 27, 2025
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/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.1200.ARM64.Open
- osx.13.arm64.open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.1200.ARM64
Copy link
Member

@akoeplinger akoeplinger Feb 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bump this one too?

Suggested change
- OSX.1200.ARM64
- osx.13.arm64


Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:

# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- OSX.1200.ARM64.Open
- osx.13.arm64.open

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
Expand Down
5 changes: 5 additions & 0 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'osx' and '$(TargetArchitecture)' == 'arm64'">
<!-- https://github.com/dotnet/dnceng/issues/3008 - osx Helix queue doesn't have OpenSSL -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.OpenSsl\tests\System.Security.Cryptography.OpenSsl.Tests.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'browser'">
<!-- Samples which are too complex for CI -->
<ProjectExclusions Include="$(MonoProjectRoot)sample\wasm\console-node-ts\Wasm.Console.Node.TS.Sample.csproj" />
Expand Down
Loading