Skip to content
代码片段 群组 项目
未验证 提交 83483d76 编辑于 作者: Doug Bunting's avatar Doug Bunting 提交者: GitHub
浏览文件

[release/6.0] Use new Arm64 Helix queues (#45538)

- unclean `cherry-pick` of e609b1ca plus touch our YAML, via #45121
- also, get scheduled runs going for aspnetcore-helix-matrix
  - release/6.0 and release/7.0 builds have not run since move to dnceng-public/public

nit: Change `$(IsXYZQueue)` properties to ignore case
- removes one gotcha going forward
上级 d9de61fa
No related branches found
No related tags found
无相关合并请求
...@@ -11,9 +11,7 @@ schedules: ...@@ -11,9 +11,7 @@ schedules:
- cron: "0 9 * * *" - cron: "0 9 * * *"
branches: branches:
include: include:
- release/5.0
- release/6.0 - release/6.0
always: false
variables: variables:
- ${{ if ne(variables['System.TeamProject'], 'internal') }}: - ${{ if ne(variables['System.TeamProject'], 'internal') }}:
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11> <HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11>
<HelixQueueFedora34>(Fedora.34.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix</HelixQueueFedora34> <HelixQueueFedora34>(Fedora.34.Amd64.Open)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix</HelixQueueFedora34>
<HelixQueueMariner>(Mariner)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix</HelixQueueMariner> <HelixQueueMariner>(Mariner)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix</HelixQueueMariner>
<HelixQueueArmDebian11>(Debian.11.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8</HelixQueueArmDebian11> <HelixQueueArmDebian11>(Debian.11.Arm64.Open)ubuntu.2004.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8</HelixQueueArmDebian11>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true'"> <ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true'">
...@@ -58,13 +58,13 @@ ...@@ -58,13 +58,13 @@
<!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on it's setup scripts. --> <!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on it's setup scripts. -->
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'"> <ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
<HelixAvailableTargetQueue Include="Windows.10.Arm64v8.Open" Platform="Windows" /> <HelixAvailableTargetQueue Include="windows.11.arm64.open" Platform="Windows" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<IsWindowsHelixQueue>false</IsWindowsHelixQueue> <IsWindowsHelixQueue>false</IsWindowsHelixQueue>
<IsWindowsHelixQueue Condition="$(HelixTargetQueue.Contains('Windows')) or $(HelixTargetQueue.Contains('windows'))">true</IsWindowsHelixQueue> <IsWindowsHelixQueue Condition="$(HelixTargetQueue.ToUpperInvariant().Contains('WINDOWS'))">true</IsWindowsHelixQueue>
<IsMacHelixQueue>false</IsMacHelixQueue> <IsMacHelixQueue>false</IsMacHelixQueue>
<IsMacHelixQueue Condition="$(HelixTargetQueue.Contains('OSX')) or $(HelixTargetQueue.Contains('macOs'))">true</IsMacHelixQueue> <IsMacHelixQueue Condition="$(HelixTargetQueue.ToUpperInvariant().Contains('OSX'))">true</IsMacHelixQueue>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册