Skip to content

Commit b914fb6

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 efb5a38 commit b914fb6

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

eng/targets/Helix.Common.props

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

910
<ItemGroup Condition="'$(IsWindowsOnlyTest)' == 'true'">
10-
<HelixAvailablePlatform Include="Windows" />
11+
<HelixAvailablePlatform Include="Windows" Condition=" '$(TargetOsName)' == 'win' " />
1112
</ItemGroup>
1213

1314
<!-- PR(ci.yaml) required queues -->
1415
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(_UseHelixOpenQueues)' == 'true'">
1516
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
1617
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" />
17-
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="Linux" />
1818
</ItemGroup>
1919

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

0 commit comments

Comments
 (0)