Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI matrix change: Windows #58989

Merged
merged 15 commits into from
Mar 28, 2022
Merged

CI matrix change: Windows #58989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
366ff58
CI matrix change: Windows
Sep 11, 2021
3b0f94e
Remove Windows Server RS5
Sep 14, 2021
b359267
Merge remote-tracking branch 'upstream/main' into jajahoda/libmatrix-…
Sep 15, 2021
a165492
Revert .net Framework change
Sep 21, 2021
89fbd40
Add 19H1 to rolling
Sep 24, 2021
492a6f2
Add Windows.Server.Core.20H2 to CI matrix
Sep 24, 2021
44bb535
Merge remote-tracking branch 'upstream/main' into jajahoda/libmatrix-…
Sep 29, 2021
2aa6e36
Remove Windows 8.1
Sep 29, 2021
9e54a1a
Merge remote-tracking branch 'origin/jajahoda/libmatrix-windows' into…
Sep 29, 2021
3bb28e7
Merge remote-tracking branch 'upstream/main' into jajahoda/libmatrix-…
Oct 5, 2021
f7ba705
Merge remote-tracking branch 'upstream/main' into jajahoda/libmatrix-…
Nov 23, 2021
c0dec52
Remove 20H2 as thhere is a PR for it #60054
Nov 25, 2021
0f2e65f
Merge branch 'main' into jajahoda/libmatrix-windows
agocke Mar 7, 2022
4007922
Typo
agocke Mar 7, 2022
1e9b9ff
Merge branch 'main' into jajahoda/libmatrix-windows
danmoseley Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ jobs:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504
- Windows.7.Amd64.Open
- Windows.81.Amd64.Open
- Windows.10.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- Windows.7.Amd64
Expand All @@ -139,7 +138,6 @@ jobs:
- Windows.10.Amd64.Open
- ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- Windows.7.Amd64.Open
- Windows.81.Amd64.Open
- Windows.10.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- Windows.7.Amd64
Expand Down
15 changes: 7 additions & 8 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,27 +125,26 @@ jobs:
- ${{ if notIn(parameters.jobParameters.framework, 'net48') }}:
# libraries on mono outerloop
- ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- Windows.81.Amd64.Open
- Windows.Amd64.Server2022.Open
# libraries on coreclr (outerloop and innerloop), or libraries on mono innerloop
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- Windows.10.Amd64.ServerRS5.Open
- Windows.Amd64.Server2022.Open
- ${{ if ne(parameters.jobParameters.testScope, 'outerloop') }}:
- Windows.Amd64.Server2022.Open
- (Windows.Server.Core.1909.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c
- (Windows.Server.Core.2004.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- Windows.81.Amd64.Open
- Windows.10.Amd64.Server2022.ES.Open
- Windows.11.Amd64.ClientPre.Open
- ${{ if eq(parameters.jobParameters.testScope, 'outerloop') }}:
- (Windows.Server.Core.1909.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c
- (Windows.Server.Core.2004.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c
- ${{ if ne(parameters.jobParameters.runtimeFlavor, 'mono') }}:
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504

# .NETFramework
- ${{ if eq(parameters.jobParameters.framework, 'net48') }}:
- Windows.10.Amd64.Client21H1.Open
- Windows.11.Amd64.ClientPre.Open


# windows x86
- ${{ if eq(parameters.platform, 'windows_x86') }}:
Expand All @@ -154,11 +153,11 @@ jobs:
# mono outerloop
- ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- Windows.7.Amd64.Open
- Windows.10.Amd64.ServerRS5.Open
- Windows.11.Amd64.ClientPre.Open
# libraries on coreclr (outerloop and innerloop), or libraries on mono innerloop
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- Windows.10.Amd64.ServerRS5.Open
- Windows.11.Amd64.ClientPre.Open
- Windows.Amd64.Server2022.Open
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- Windows.10.Amd64.Server2022.ES.Open
Expand Down