Skip to content

[release/9.0] Bump OSX.12 helix queues to OSX.13 #119814

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 5 commits into from
Sep 26, 2025
Merged

[release/9.0] Bump OSX.12 helix queues to OSX.13 #119814

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
981d01a
[release/9.0] Bump OSX.12 helix queues to OSX.13
steveisok Sep 17, 2025
b745490
Do superpmi too
steveisok Sep 17, 2025
5af23a6
Incorporate https://github.com/dotnet/runtime/pull/112647
steveisok Sep 17, 2025
12ebc64
Backport https://github.com/dotnet/runtime/pull/119273 for msquic and…
steveisok Sep 22, 2025
fb192c3
Exclude msquic package in tests
steveisok Sep 25, 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
8 changes: 4 additions & 4 deletions 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,16 +105,16 @@ 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
- OSX.13.ARM64

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.1200.Amd64.Open
- OSX.13.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.1200.Amd64
- OSX.13.Amd64

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ 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') }}:
- OSX.1200.Amd64.Open
- OSX.13.Amd64.Open

# Android
- ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/scripts/superpmi_collect_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ def main(main_args):
else:
helix_queue = "Ubuntu.2204.Amd64"
elif platform_name == "osx":
helix_queue = "OSX.1200.ARM64" if arch == "arm64" else "OSX.1200.Amd64"
helix_queue = "OSX.13.ARM64" if arch == "arm64" else "OSX.13.Amd64"

# Copy the superpmi scripts

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