Skip to content

Commit 82f907b

Browse files
committed
nits:
- fix `%(Platform)` metadata for OSX `@(HelixAvailableTargetQueue)` items - don't mention unused internal queues in `$(TestDependsOnPlaywright)` update of `$(SkipHelixQueues)` - sort remaining queues alphabetically in `$(SkipHelixQueues)`
1 parent 20eed70 commit 82f907b

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

eng/targets/Helix.Common.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(_UseHelixOpenQueues)' == 'true'">
1515
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
1616
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" />
17-
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="Linux" />
17+
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="OSX" />
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.2004.Amd64.Open" Platform="Linux" />
23-
<HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="Linux" />
23+
<HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="OSX" />
2424
<HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
2525
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
2626
<HelixAvailableTargetQueue Include="(Fedora.33.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267" Platform="Linux" />

eng/targets/Helix.targets

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@
1010

1111
<PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
1212
<SkipHelixQueues>
13-
Windows.7.Amd64.Open;
14-
Windows.81.Amd64.Open;
15-
Redhat.7.Amd64.Open;
16-
Redhat.7.Amd64;
17-
Debian.9.Amd64.Open;
18-
Debian.9.Amd64;
19-
Ubuntu.2004.Amd64.Open;
20-
Ubuntu.2004.Amd64;
2113
(Alpine.312.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673;
2214
(Fedora.33.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267
15+
Debian.9.Amd64.Open;
16+
Redhat.7.Amd64.Open;
17+
Ubuntu.2004.Amd64.Open;
18+
Windows.7.Amd64.Open;
19+
Windows.81.Amd64.Open;
2320
</SkipHelixQueues>
2421
<SkipHelixArm>true</SkipHelixArm>
2522
</PropertyGroup>

0 commit comments

Comments
 (0)