@@ -242,11 +242,11 @@ def CreateStyleCheckTasks = { taskString, taskName, checkName ->
242
242
243
243
// The latest machine seems to have a configuration problem preventing us from building ARM.
244
244
// For now, build ARM on the LKG config, Legacy Windows 8.1 (Blue) config.
245
- // TODO When the configuration is updated, unify this config split.
245
+ // TODO When the Windows 10 configuration is updated to fix ARM builds , unify this config split.
246
246
CreateBuildTasks (latestWindowsMachine, latestWindowsMachineTag, null , null , " -win10" , true ,
247
- /* excludeConfigIf */ { isPR , buildArch , buildType -> (buildArch == ' arm' ) }, null )
247
+ /* excludeConfigIf */ { isPR , buildArch , buildType -> (buildArch == ' arm' ) }, null ) // configures everything except ARM
248
248
CreateBuildTasks (legacyWindows8Machine, legacyWindows8MachineTag, null , null , " -winBlue" , true ,
249
- /* excludeConfigIf */ { isPR , buildArch , buildType -> (buildArch != ' arm' ) }, null )
249
+ /* excludeConfigIf */ { isPR , buildArch , buildType -> (buildArch != ' arm' ) }, null ) // configures ARM
250
250
251
251
// Add some additional daily configs to trigger per-PR as a quality gate:
252
252
// x64_debug Slow Tests
@@ -272,39 +272,60 @@ CreateBuildTask(true, 'x64', 'debug',
272
272
if (! branch. endsWith(' -ci' )) {
273
273
// build and test on the legacy configuration (Windows 7 + VS 2015 (Dev14))
274
274
CreateBuildTasks (legacyWindows7Machine, legacyWindows7MachineTag, ' daily_legacy7' , ' msbuild14' , ' -win7 -includeSlow' , false ,
275
- /* excludeConfigIf */ { isPR , buildArch , buildType -> (buildArch == ' arm' ) },
275
+ /* excludeConfigIf */ { isPR , buildArch , buildType -> (buildArch == ' arm' ) }, // excludes ARM
276
276
/* nonDefaultTaskSetup */ { newJob , isPR , config ->
277
277
DailyBuildTaskSetup (newJob, isPR,
278
278
" Windows 7 ${ config} " ,
279
279
' legacy7?\\ s+tests)' )})
280
280
281
281
// build and test on the legacy configuration (Windows 8.1 (Blue) + VS 2015 (Dev14))
282
282
CreateBuildTasks (legacyWindows8Machine, legacyWindows8MachineTag, ' daily_legacy8' , ' msbuild14' , ' -winBlue -includeSlow' , false ,
283
- /* excludeConfigIf */ { isPR , buildArch , buildType -> (buildArch == ' arm ' ) },
283
+ /* excludeConfigIf */ null , // ARM builds previously worked on this configuration, so don't exclude them unless we explicitly drop support
284
284
/* nonDefaultTaskSetup */ { newJob , isPR , config ->
285
285
DailyBuildTaskSetup (newJob, isPR,
286
286
" Windows 8 ${ config} " ,
287
287
' legacy8?\\ s+tests' )})
288
288
289
289
// build and test on the latest configuration (RS4 + VS 2017 Dev 15.7) with -includeSlow
290
+ // TODO When the Windows 10 configuration is updated to fix ARM builds, unify this config split.
290
291
CreateBuildTasks (latestWindowsMachine, latestWindowsMachineTag, ' daily_slow' , null , ' -win10 -includeSlow' , false ,
291
- /* excludeConfigIf */ null ,
292
+ /* excludeConfigIf */ { isPR , buildArch , buildType -> (buildArch == ' arm' ) }, // configures everything except ARM
293
+ /* nonDefaultTaskSetup */ { newJob , isPR , config ->
294
+ DailyBuildTaskSetup (newJob, isPR,
295
+ " Windows ${ config} " ,
296
+ ' slow\\ s+tests' )})
297
+ CreateBuildTasks (legacyWindows8Machine, legacyWindows8MachineTag, ' daily_slow' , null , ' -winBlue -includeSlow' , false ,
298
+ /* excludeConfigIf */ { isPR , buildArch , buildType -> (buildArch != ' arm' ) }, // configures ARM
292
299
/* nonDefaultTaskSetup */ { newJob , isPR , config ->
293
300
DailyBuildTaskSetup (newJob, isPR,
294
301
" Windows ${ config} " ,
295
302
' slow\\ s+tests' )})
296
303
297
304
// build and test on the latest configuration (RS4 + VS 2017 Dev 15.7) with JIT disabled
305
+ // TODO When the Windows 10 configuration is updated to fix ARM builds, unify this config split.
298
306
CreateBuildTasks (latestWindowsMachine, latestWindowsMachineTag, ' daily_disablejit' , ' "/p:BuildJIT=false"' , ' -win10 -disablejit' , true ,
299
- /* excludeConfigIf */ null ,
307
+ /* excludeConfigIf */ { isPR , buildArch , buildType -> (buildArch == ' arm' ) }, // configures everything except ARM
308
+ /* nonDefaultTaskSetup */ { newJob , isPR , config ->
309
+ DailyBuildTaskSetup (newJob, isPR,
310
+ " Windows ${ config} " ,
311
+ ' (disablejit|nojit)\\ s+tests' )})
312
+ CreateBuildTasks (legacyWindows8Machine, legacyWindows8MachineTag, ' daily_disablejit' , ' "/p:BuildJIT=false"' , ' -winBlue -disablejit' , true ,
313
+ /* excludeConfigIf */ { isPR , buildArch , buildType -> (buildArch != ' arm' ) }, // configures ARM
300
314
/* nonDefaultTaskSetup */ { newJob , isPR , config ->
301
315
DailyBuildTaskSetup (newJob, isPR,
302
316
" Windows ${ config} " ,
303
317
' (disablejit|nojit)\\ s+tests' )})
304
318
305
319
// build and test on the latest configuration (RS4 + VS 2017 Dev 15.7) with Lite build
320
+ // TODO When the Windows 10 configuration is updated to fix ARM builds, unify this config split.
306
321
CreateBuildTasks (latestWindowsMachine, latestWindowsMachineTag, ' daily_lite' , ' "/p:BuildLite=true"' , ' -win10 -lite' , true ,
307
- /* excludeConfigIf */ null ,
322
+ /* excludeConfigIf */ { isPR , buildArch , buildType -> (buildArch == ' arm' ) }, // configures everything except ARM
323
+ /* nonDefaultTaskSetup */ { newJob , isPR , config ->
324
+ DailyBuildTaskSetup (newJob, isPR,
325
+ " Windows ${ config} " ,
326
+ ' lite\\ s+tests' )})
327
+ CreateBuildTasks (legacyWindows8Machine, legacyWindows8MachineTag, ' daily_lite' , ' "/p:BuildLite=true"' , ' -winBlue -lite' , true ,
328
+ /* excludeConfigIf */ { isPR , buildArch , buildType -> (buildArch != ' arm' ) }, // configures ARM
308
329
/* nonDefaultTaskSetup */ { newJob , isPR , config ->
309
330
DailyBuildTaskSetup (newJob, isPR,
310
331
" Windows ${ config} " ,
0 commit comments