Skip to content

Commit e47cc7b

Browse files
committed
!temporary! Minimize use of unlike Helix queues
- eliminate OSX queue usage - only target Linux queues in the "Tests: Helix ARM64 matrix" job that builds on Linux
1 parent d6d964f commit e47cc7b

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

eng/targets/Helix.Common.props

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
<Project>
22
<!-- this file is shared between Helix.proj and .csproj files -->
33
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true'">
4-
<HelixAvailablePlatform Include="Windows" />
5-
<HelixAvailablePlatform Include="OSX" />
6-
<HelixAvailablePlatform Include="Linux" />
4+
<HelixAvailablePlatform Include="Windows" Condition=" '$(TargetOsName)' == 'win' " />
5+
<HelixAvailablePlatform Include="Linux" Condition=" '$(TargetOsName)' == 'linux' " />
76
</ItemGroup>
87

98
<ItemGroup Condition="'$(IsWindowsOnlyTest)' == 'true'">
10-
<HelixAvailablePlatform Include="Windows" />
9+
<HelixAvailablePlatform Include="Windows" Condition=" '$(TargetOsName)' == 'win' " />
1110
</ItemGroup>
1211

1312
<!-- PR(ci.yaml) required queues -->
1413
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(_UseHelixOpenQueues)' == 'true'">
1514
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
1615
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" />
17-
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="Linux" />
1816
</ItemGroup>
1917

2018
<!-- queues for helix-matrix.yml pipeline -->
2119
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
2220
<HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
2321
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
24-
<HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="Linux" />
2522
<HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
2623
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
2724
<HelixAvailableTargetQueue Include="(Fedora.33.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267" Platform="Linux" />

0 commit comments

Comments
 (0)