Skip to content
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

Jump to bottom

CI matrix change: Add OSX 12 arm #59085

Closed
wants to merge 5 commits into from
Closed

CI matrix change: Add OSX 12 arm #59085

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a627ba0
Add OSX 12 arm
Sep 14, 2021
64f2806
Merge remote-tracking branch 'upstream/main' into jajahoda/libmatrix-…
Sep 15, 2021
369da89
Fix mac os version
Sep 29, 2021
7d37886
Merge remote-tracking branch 'upstream/main' into jajahoda/libmatrix-…
Dec 2, 2021
a9d16d5
Merge remote-tracking branch 'upstream/main' into jajahoda/libmatrix-…
Dec 14, 2021
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 @@ -107,7 +107,7 @@ jobs:
# OSX arm64
- ${{ if eq(parameters.platform, 'OSX_arm64') }}:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- OSX.1100.ARM64.Open
- OSX.1500.ARM64.Open
Copy link
Member

Choose a reason for hiding this comment

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

What is 1500? I assumed that on Arm64, macOS followed the same version numbering -- ie macOS 11 or macOS12. Is that not right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, it is mistake, it should be 1200

- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.1100.ARM64

Expand Down
2 changes: 2 additions & 0 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 @@ -90,6 +90,7 @@ jobs:
# OSX arm64
- ${{ if eq(parameters.platform, 'OSX_arm64') }}:
- OSX.1100.ARM64.Open
- OSX.1200.ARM64.Open
Copy link
Member

Choose a reason for hiding this comment

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

Just curious, how can I tell this is libraries tests, as opposed eg to CLR tests ? It's not clear to me - I'm not familiar with how this works.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ad far as I understand
CLR: eng/pipelines/coreclr/templates/helix-queues-setup.yml
Libs: eng/pipelines/libraries/helix-queues-setup.yml

But it is still black box for me how it is orchestrated.

@ViktorHofer is there any docs available?

Copy link
Member

@steveisok steveisok Oct 30, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

This file associates the queue to platform. To see if it runs, you'll have to check the runtime ymls to see if the platform is defined. A quick spot check looks like osx-arm64 is defined only for the runtime tests.

Actually, I stand corrected. It's in runtime-staging. It looks like it's only configured for the rolling build.


# OSX x64
- ${{ if eq(parameters.platform, 'OSX_x64') }}:
Expand All @@ -110,6 +111,7 @@ jobs:
# iOS Simulator/Mac Catalyst arm64
- ${{ if in(parameters.platform, 'MacCatalyst_arm64', 'iOSSimulator_arm64') }}:
- OSX.1100.ARM64.Open
- OSX.1200.ARM64.Open

# iOS/tvOS simulator x64/x86 & MacCatalyst x64
- ${{ if in(parameters.platform, 'iOSSimulator_x64', 'iOSSimulator_x86', 'tvOSSimulator_x64', 'MacCatalyst_x64') }}:
Expand Down