Skip to content

Commit dfa71ee

Browse files
Use osx.13.arm64.open queue for osx testing (#112647)
* Use osx.13.arm64.open queue for osx testing * Update tests.proj
1 parent a6d1421 commit dfa71ee

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

eng/pipelines/coreclr/templates/helix-queues-setup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
# OSX arm64
106106
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
107107
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
108-
- OSX.1200.ARM64.Open
108+
- osx.13.arm64.open
109109
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
110110
- OSX.1200.ARM64
111111

eng/pipelines/libraries/helix-queues-setup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

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

8989
# OSX x64
9090
- ${{ if eq(parameters.platform, 'osx_x64') }}:

src/libraries/tests.proj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj" />
4141
</ItemGroup>
4242

43+
<ItemGroup Condition="'$(TargetOS)' == 'osx' and '$(TargetArchitecture)' == 'arm64'">
44+
<!-- https://github.com/dotnet/dnceng/issues/3008 - osx Helix queue doesn't have OpenSSL -->
45+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.OpenSsl\tests\System.Security.Cryptography.OpenSsl.Tests.csproj" />
46+
</ItemGroup>
47+
4348
<ItemGroup Condition="'$(TargetOS)' == 'browser'">
4449
<!-- Samples which are too complex for CI -->
4550
<ProjectExclusions Include="$(MonoProjectRoot)sample\wasm\console-node-ts\Wasm.Console.Node.TS.Sample.csproj" />

0 commit comments

Comments
 (0)