mirror of https://github.com/dotnet/runtime
Merge 90b9fde1eb
into 123627ba0f
This commit is contained in:
commit
53514b15b8
|
@ -104,20 +104,17 @@ jobs:
|
|||
|
||||
# OSX arm64
|
||||
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
|
||||
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
|
||||
- OSX.13.Arm64.Open
|
||||
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
|
||||
# superpmi is not about testing platform differences, so go with highest capacity queue
|
||||
- OSX.14.Arm64.Open
|
||||
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
- OSX.15.Arm64.Open
|
||||
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
- OSX.1200.Arm64
|
||||
- OSX.15.Arm64
|
||||
|
||||
# OSX x64
|
||||
- ${{ if eq(parameters.platform, 'osx_x64') }}:
|
||||
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
- OSX.1200.Amd64.Open
|
||||
- OSX.15.Amd64.Open
|
||||
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
- OSX.1200.Amd64
|
||||
- OSX.15.Amd64
|
||||
|
||||
# windows x64
|
||||
- ${{ if eq(parameters.platform, 'windows_x64') }}:
|
||||
|
|
|
@ -78,11 +78,11 @@ jobs:
|
|||
|
||||
# OSX arm64
|
||||
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
|
||||
- osx.13.arm64.open
|
||||
- osx.15.arm64.open
|
||||
|
||||
# OSX x64
|
||||
- ${{ if eq(parameters.platform, 'osx_x64') }}:
|
||||
- OSX.1200.Amd64.Open
|
||||
- OSX.14.Amd64.Open
|
||||
|
||||
# Android
|
||||
- ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:
|
||||
|
|
Loading…
Reference in New Issue