Skip to content

Commit 255d1c5

Browse files
amanasifkhalidamanasifkhalid
authored
[release/6.0-staging] Merge #78968 (#103312)
1 parent 30900da commit 255d1c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+4511
-4429
lines changed

‎eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎eng/pipelines/coreclr/ci.yml‎

Lines changed: 122 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -25,131 +25,133 @@ trigger:
2525
- eng/pipelines/runtime.yml
2626

2727
extends:
28-
template: /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
28+
template: /eng/pipelines/common/templates/pipeline-with-resources.yml
2929
parameters:
30-
jobs:
30+
stages:
31+
- stage: Build
32+
jobs:
3133

32-
#
33-
# Debug builds
34-
#
35-
- template: /eng/pipelines/common/platform-matrix.yml
36-
parameters:
37-
jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
38-
buildConfig: debug
39-
platforms:
40-
- Linux_arm
41-
- Linux_arm64
42-
- Linux_musl_arm64
43-
- Linux_musl_x64
44-
- Linux_x64
45-
- OSX_arm64
46-
- OSX_x64
47-
- windows_arm
48-
- windows_arm64
49-
jobParameters:
50-
testGroup: outerloop
51-
52-
#
53-
# Checked builds
54-
#
55-
- template: /eng/pipelines/common/platform-matrix.yml
56-
parameters:
57-
jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
58-
buildConfig: checked
59-
platformGroup: all
60-
platforms:
61-
# It is too early to include OSX_arm64 in platform group all
62-
# Adding it here will enable it also
63-
- OSX_arm64
64-
jobParameters:
65-
testGroup: outerloop
34+
#
35+
# Debug builds
36+
#
37+
- template: /eng/pipelines/common/platform-matrix.yml
38+
parameters:
39+
jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
40+
buildConfig: debug
41+
platforms:
42+
- Linux_arm
43+
- Linux_arm64
44+
- Linux_musl_arm64
45+
- Linux_musl_x64
46+
- Linux_x64
47+
- OSX_arm64
48+
- OSX_x64
49+
- windows_arm
50+
- windows_arm64
51+
jobParameters:
52+
testGroup: outerloop
6653

67-
#
68-
# Release builds
69-
#
70-
- template: /eng/pipelines/common/platform-matrix.yml
71-
parameters:
72-
jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
73-
buildConfig: release
74-
platforms:
75-
- Linux_arm
76-
- Linux_musl_arm64
77-
- Linux_x64
78-
- OSX_arm64
79-
- OSX_x64
80-
- windows_x86
81-
jobParameters:
82-
testGroup: outerloop
54+
#
55+
# Checked builds
56+
#
57+
- template: /eng/pipelines/common/platform-matrix.yml
58+
parameters:
59+
jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
60+
buildConfig: checked
61+
platformGroup: all
62+
platforms:
63+
# It is too early to include OSX_arm64 in platform group all
64+
# Adding it here will enable it also
65+
- OSX_arm64
66+
jobParameters:
67+
testGroup: outerloop
8368

84-
#
85-
# Release library builds
86-
#
87-
- template: /eng/pipelines/common/platform-matrix.yml
88-
parameters:
89-
jobTemplate: /eng/pipelines/libraries/build-job.yml
90-
buildConfig: Release
91-
platformGroup: all
92-
platforms:
93-
# It is too early to include OSX_arm64 in platform group all
94-
# Adding it here will enable it also
95-
- OSX_arm64
96-
jobParameters:
97-
isOfficialBuild: false
98-
liveRuntimeBuildConfig: checked
69+
#
70+
# Release builds
71+
#
72+
- template: /eng/pipelines/common/platform-matrix.yml
73+
parameters:
74+
jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
75+
buildConfig: release
76+
platforms:
77+
- Linux_arm
78+
- Linux_musl_arm64
79+
- Linux_x64
80+
- OSX_arm64
81+
- OSX_x64
82+
- windows_x86
83+
jobParameters:
84+
testGroup: outerloop
9985

100-
#
101-
# Checked test builds
102-
#
103-
- template: /eng/pipelines/common/platform-matrix.yml
104-
parameters:
105-
jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml
106-
buildConfig: checked
107-
platforms:
108-
- CoreClrTestBuildHost # Either OSX_x64 or Linux_x64
109-
testGroup: outerloop
110-
jobParameters:
111-
liveLibrariesBuildConfig: Release
86+
#
87+
# Release library builds
88+
#
89+
- template: /eng/pipelines/common/platform-matrix.yml
90+
parameters:
91+
jobTemplate: /eng/pipelines/libraries/build-job.yml
92+
buildConfig: Release
93+
platformGroup: all
94+
platforms:
95+
# It is too early to include OSX_arm64 in platform group all
96+
# Adding it here will enable it also
97+
- OSX_arm64
98+
jobParameters:
99+
isOfficialBuild: false
100+
liveRuntimeBuildConfig: checked
112101

113-
#
114-
# Checked JIT test runs
115-
#
116-
- template: /eng/pipelines/common/platform-matrix.yml
117-
parameters:
118-
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
119-
buildConfig: checked
120-
platformGroup: all
121-
platforms:
122-
# It is too early to include OSX_arm64 in platform group all
123-
# Adding it here will enable it to also run this test
124-
- OSX_arm64
125-
helixQueueGroup: ci
126-
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
127-
jobParameters:
102+
#
103+
# Checked test builds
104+
#
105+
- template: /eng/pipelines/common/platform-matrix.yml
106+
parameters:
107+
jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml
108+
buildConfig: checked
109+
platforms:
110+
- CoreClrTestBuildHost # Either OSX_x64 or Linux_x64
128111
testGroup: outerloop
129-
liveLibrariesBuildConfig: Release
112+
jobParameters:
113+
liveLibrariesBuildConfig: Release
130114

131-
#
132-
# Checked R2R test runs
133-
#
134-
- template: /eng/pipelines/common/platform-matrix.yml
135-
parameters:
136-
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
137-
buildConfig: checked
138-
platforms:
139-
- Linux_arm64
140-
- Linux_musl_x64
141-
- Linux_musl_arm64
142-
- Linux_x64
143-
- OSX_x64
144-
- windows_x64
145-
- windows_x86
146-
- windows_arm
147-
- windows_arm64
148-
helixQueueGroup: ci
149-
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
150-
jobParameters:
151-
testGroup: outerloop
152-
readyToRun: true
153-
crossgen2: true
154-
displayNameArgs: R2R_CG2
155-
liveLibrariesBuildConfig: Release
115+
#
116+
# Checked JIT test runs
117+
#
118+
- template: /eng/pipelines/common/platform-matrix.yml
119+
parameters:
120+
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
121+
buildConfig: checked
122+
platformGroup: all
123+
platforms:
124+
# It is too early to include OSX_arm64 in platform group all
125+
# Adding it here will enable it to also run this test
126+
- OSX_arm64
127+
helixQueueGroup: ci
128+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
129+
jobParameters:
130+
testGroup: outerloop
131+
liveLibrariesBuildConfig: Release
132+
133+
#
134+
# Checked R2R test runs
135+
#
136+
- template: /eng/pipelines/common/platform-matrix.yml
137+
parameters:
138+
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
139+
buildConfig: checked
140+
platforms:
141+
- Linux_arm64
142+
- Linux_musl_x64
143+
- Linux_musl_arm64
144+
- Linux_x64
145+
- OSX_x64
146+
- windows_x64
147+
- windows_x86
148+
- windows_arm
149+
- windows_arm64
150+
helixQueueGroup: ci
151+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
152+
jobParameters:
153+
testGroup: outerloop
154+
readyToRun: true
155+
crossgen2: true
156+
displayNameArgs: R2R_CG2
157+
liveLibrariesBuildConfig: Release

‎eng/pipelines/coreclr/clrinterpreter.yml‎

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,48 +9,50 @@ schedules:
99
always: true
1010

1111
extends:
12-
template: /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
12+
template: /eng/pipelines/common/templates/pipeline-with-resources.yml
1313
parameters:
14-
jobs:
14+
stages:
15+
- stage: Build
16+
jobs:
1517

16-
- template: /eng/pipelines/common/platform-matrix.yml
17-
parameters:
18-
jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml
19-
buildConfig: checked
20-
platforms:
21-
- Linux_arm
22-
- Linux_arm64
23-
- Linux_x64
24-
- windows_x64
25-
- windows_x86
26-
- windows_arm64
27-
- CoreClrTestBuildHost # Either OSX_x64 or Linux_x64
28-
jobParameters:
29-
testGroup: clrinterpreter
18+
- template: /eng/pipelines/common/platform-matrix.yml
19+
parameters:
20+
jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml
21+
buildConfig: checked
22+
platforms:
23+
- Linux_arm
24+
- Linux_arm64
25+
- Linux_x64
26+
- windows_x64
27+
- windows_x86
28+
- windows_arm64
29+
- CoreClrTestBuildHost # Either OSX_x64 or Linux_x64
30+
jobParameters:
31+
testGroup: clrinterpreter
3032

31-
- template: /eng/pipelines/common/platform-matrix.yml
32-
parameters:
33-
jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml
34-
buildConfig: checked
35-
platforms:
36-
- CoreClrTestBuildHost # Either OSX_x64 or Linux_x64
37-
jobParameters:
38-
testGroup: clrinterpreter
39-
liveLibrariesBuildConfig: Release
33+
- template: /eng/pipelines/common/platform-matrix.yml
34+
parameters:
35+
jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml
36+
buildConfig: checked
37+
platforms:
38+
- CoreClrTestBuildHost # Either OSX_x64 or Linux_x64
39+
jobParameters:
40+
testGroup: clrinterpreter
41+
liveLibrariesBuildConfig: Release
4042

41-
- template: /eng/pipelines/common/platform-matrix.yml
42-
parameters:
43-
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
44-
buildConfig: checked
45-
platforms:
46-
- Linux_arm
47-
- Linux_arm64
48-
- Linux_x64
49-
- windows_x64
50-
- windows_x86
51-
- windows_arm64
52-
helixQueueGroup: ci
53-
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
54-
jobParameters:
55-
testGroup: clrinterpreter
56-
liveLibrariesBuildConfig: Release
43+
- template: /eng/pipelines/common/platform-matrix.yml
44+
parameters:
45+
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
46+
buildConfig: checked
47+
platforms:
48+
- Linux_arm
49+
- Linux_arm64
50+
- Linux_x64
51+
- windows_x64
52+
- windows_x86
53+
- windows_arm64
54+
helixQueueGroup: ci
55+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
56+
jobParameters:
57+
testGroup: clrinterpreter
58+
liveLibrariesBuildConfig: Release

0 commit comments

Comments
 (0)