Skip to content

Commit 44978f0

Browse files
authored
Enable all configurations inner loop (#108848)
* Revert "Disable linux-x64 dev-innerloop (#108581)" This reverts commit 7b69459. * Don't build tests in linux_x64_dev_innerloop Testing to determine if building tests were the source of OOMs in CI
1 parent 0212c3d commit 44978f0

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

eng/pipelines/common/platform-matrix.yml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -298,24 +298,23 @@ jobs:
298298

299299
# Runtime-dev-innerloop build
300300

301-
# disabled against https://github.com/dotnet/runtime/issues/108821
302-
#- ${{ if containsValue(parameters.platforms, 'linux_x64_dev_innerloop') }}:
303-
# - template: xplat-setup.yml
304-
# parameters:
305-
# jobTemplate: ${{ parameters.jobTemplate }}
306-
# helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
307-
# variables: ${{ parameters.variables }}
308-
# osGroup: linux
309-
# archType: x64
310-
# targetRid: linux-x64
311-
# platform: linux_x64
312-
# shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
313-
# container: linux_x64_dev_innerloop
314-
# jobParameters:
315-
# runtimeFlavor: ${{ parameters.runtimeFlavor }}
316-
# buildConfig: ${{ parameters.buildConfig }}
317-
# helixQueueGroup: ${{ parameters.helixQueueGroup }}
318-
# ${{ insert }}: ${{ parameters.jobParameters }}
301+
- ${{ if containsValue(parameters.platforms, 'linux_x64_dev_innerloop') }}:
302+
- template: xplat-setup.yml
303+
parameters:
304+
jobTemplate: ${{ parameters.jobTemplate }}
305+
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
306+
variables: ${{ parameters.variables }}
307+
osGroup: linux
308+
archType: x64
309+
targetRid: linux-x64
310+
platform: linux_x64
311+
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
312+
container: linux_x64_dev_innerloop
313+
jobParameters:
314+
runtimeFlavor: ${{ parameters.runtimeFlavor }}
315+
buildConfig: ${{ parameters.buildConfig }}
316+
helixQueueGroup: ${{ parameters.helixQueueGroup }}
317+
${{ insert }}: ${{ parameters.jobParameters }}
319318

320319
- ${{ if containsValue(parameters.platforms, 'linux_musl_x64_dev_innerloop') }}:
321320
- template: xplat-setup.yml

eng/pipelines/global-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ extends:
8282
eq(variables['isRollingBuild'], true))
8383

8484
#
85-
# Build Libraries AllConfigurations. This exercises the code path where we build libraries and tests for all
85+
# Build Libraries AllConfigurations. This exercises the code path where we build libraries for all
8686
# configurations on a non Windows operating system.
8787
#
8888
- template: /eng/pipelines/common/platform-matrix.yml
@@ -93,7 +93,7 @@ extends:
9393
- linux_x64_dev_innerloop
9494
jobParameters:
9595
nameSuffix: Libraries_AllConfigurations
96-
buildArgs: -subset libs+libs.tests -allconfigurations
96+
buildArgs: -subset libs -allconfigurations
9797
timeoutInMinutes: 120
9898
condition:
9999
or(

0 commit comments

Comments
 (0)