Skip to content

Commit 0115d42

Browse files
fanyang-monofanyang-mono
committed
Revert unwanted changes
1 parent abd070f commit 0115d42

File tree

2 files changed

+123
-37
lines changed

2 files changed

+123
-37
lines changed

‎eng/pipelines/runtime-staging.yml‎

Lines changed: 89 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- template: /eng/pipelines/common/evaluate-default-paths.yml
5656

5757
#
58-
# iOS/tvOS/Catalyst interp - requires AOT Compilation and Interp flags
58+
# iOS/tvOS interp - requires AOT Compilation and Interp flags
5959
# Build the whole product using Mono and run libraries tests
6060
#
6161
- template: /eng/pipelines/common/platform-matrix.yml
@@ -65,12 +65,10 @@ jobs:
6565
buildConfig: Release
6666
runtimeFlavor: mono
6767
platforms:
68-
- MacCatalyst_x64
6968
- iOSSimulator_x64
7069
- tvOSSimulator_x64
7170
# don't run tests on arm64 PRs until we can get significantly more devices
7271
- ${{ if eq(variables['isFullMatrix'], true) }}:
73-
- MacCatalyst_arm64
7472
- iOSSimulator_arm64
7573
variables:
7674
# map dependencies variables to local variables
@@ -101,6 +99,94 @@ jobs:
10199
eq(variables['monoContainsChange'], true),
102100
eq(variables['isFullMatrix'], true))
103101
102+
#
103+
# MacCatalyst interp - requires AOT Compilation and Interp flags
104+
# Build the whole product using Mono and run libraries tests
105+
#
106+
- template: /eng/pipelines/common/platform-matrix.yml
107+
parameters:
108+
jobTemplate: /eng/pipelines/common/global-build-job.yml
109+
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
110+
buildConfig: Release
111+
runtimeFlavor: mono
112+
platforms:
113+
- MacCatalyst_x64
114+
# don't run tests on arm64 PRs until we can get significantly more devices
115+
- ${{ if eq(variables['isFullMatrix'], true) }}:
116+
- MacCatalyst_arm64
117+
variables:
118+
# map dependencies variables to local variables
119+
- name: librariesContainsChange
120+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
121+
- name: monoContainsChange
122+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
123+
jobParameters:
124+
testGroup: innerloop
125+
nameSuffix: AllSubsets_Mono
126+
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=adhoc /p:RunAOTCompilation=true /p:MonoForceInterpreter=true /p:BuildDarwinFrameworks=true
127+
timeoutInMinutes: 180
128+
condition: >-
129+
or(
130+
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
131+
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
132+
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
133+
eq(variables['isFullMatrix'], true))
134+
# extra steps, run tests
135+
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
136+
extraStepsParameters:
137+
creator: dotnet-bot
138+
interpreter: true
139+
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
140+
condition: >-
141+
or(
142+
eq(variables['librariesContainsChange'], true),
143+
eq(variables['monoContainsChange'], true),
144+
eq(variables['isFullMatrix'], true))
145+
146+
#
147+
# iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
148+
# Build the whole product using Mono and run libraries tests
149+
#
150+
- template: /eng/pipelines/common/platform-matrix.yml
151+
parameters:
152+
jobTemplate: /eng/pipelines/common/global-build-job.yml
153+
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
154+
buildConfig: Release
155+
runtimeFlavor: mono
156+
platforms:
157+
# don't run tests on arm64 PRs until we can get significantly more devices
158+
- ${{ if eq(variables['isFullMatrix'], true) }}:
159+
- iOS_arm64
160+
- tvOS_arm64
161+
variables:
162+
# map dependencies variables to local variables
163+
- name: librariesContainsChange
164+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
165+
- name: monoContainsChange
166+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
167+
jobParameters:
168+
testGroup: innerloop
169+
nameSuffix: AllSubsets_Mono
170+
buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:EnableAggressiveTrimming=true /p:BuildDarwinFrameworks=true
171+
timeoutInMinutes: 180
172+
condition: >-
173+
or(
174+
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
175+
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
176+
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
177+
eq(variables['isFullMatrix'], true))
178+
# extra steps, run tests
179+
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
180+
extraStepsParameters:
181+
creator: dotnet-bot
182+
interpreter: true
183+
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
184+
condition: >-
185+
or(
186+
eq(variables['librariesContainsChange'], true),
187+
eq(variables['monoContainsChange'], true),
188+
eq(variables['isFullMatrix'], true))
189+
104190
#
105191
# Build the whole product using Mono and run libraries tests
106192
#

‎eng/pipelines/runtime.yml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -161,40 +161,40 @@ jobs:
161161
testGroup: innerloop
162162
pgoType: 'PGO'
163163

164-
# #
165-
# # Build CoreCLR Formatting Job
166-
# # Only when CoreCLR is changed, and only in the 'main' branch (no release branches;
167-
# # both CI and PR builds).
168-
# #
169-
# - template: /eng/pipelines/common/platform-matrix.yml
170-
# parameters:
171-
# jobTemplate: /eng/pipelines/coreclr/templates/format-job.yml
172-
# platforms:
173-
# - Linux_x64
174-
# - windows_x64
175-
# jobParameters:
176-
# condition: >-
177-
# and(
178-
# or(
179-
# eq(variables['Build.SourceBranchName'], 'main'),
180-
# eq(variables['System.PullRequest.TargetBranch'], 'main')),
181-
# or(
182-
# eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
183-
# eq(variables['isFullMatrix'], true)))
164+
#
165+
# Build CoreCLR Formatting Job
166+
# Only when CoreCLR is changed, and only in the 'main' branch (no release branches;
167+
# both CI and PR builds).
168+
#
169+
- template: /eng/pipelines/common/platform-matrix.yml
170+
parameters:
171+
jobTemplate: /eng/pipelines/coreclr/templates/format-job.yml
172+
platforms:
173+
- Linux_x64
174+
- windows_x64
175+
jobParameters:
176+
condition: >-
177+
and(
178+
or(
179+
eq(variables['Build.SourceBranchName'], 'main'),
180+
eq(variables['System.PullRequest.TargetBranch'], 'main')),
181+
or(
182+
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
183+
eq(variables['isFullMatrix'], true)))
184184
185-
# # Build and test clr tools
186-
# - template: /eng/pipelines/common/platform-matrix.yml
187-
# parameters:
188-
# jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
189-
# buildConfig: checked
190-
# platforms:
191-
# - Linux_x64
192-
# jobParameters:
193-
# testGroup: clrTools
194-
# condition: >-
195-
# or(
196-
# eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
197-
# eq(variables['isFullMatrix'], true))
185+
# Build and test clr tools
186+
- template: /eng/pipelines/common/platform-matrix.yml
187+
parameters:
188+
jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
189+
buildConfig: checked
190+
platforms:
191+
- Linux_x64
192+
jobParameters:
193+
testGroup: clrTools
194+
condition: >-
195+
or(
196+
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
197+
eq(variables['isFullMatrix'], true))
198198
199199
# Build Mono AOT offset headers once, for consumption elsewhere
200200
# Only when mono changed
@@ -324,7 +324,7 @@ jobs:
324324
jobParameters:
325325
testGroup: innerloop
326326
nameSuffix: AllSubsets_Mono_WasmBuildTests
327-
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:OnlyWasmBuildTests=true /p:TestAssemblies=false
327+
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:TestWasmBuildTests=true /p:TestAssemblies=false
328328
timeoutInMinutes: 180
329329
condition: >-
330330
or(

0 commit comments

Comments
 (0)