Skip to content

Commit 583b3d2

Browse files
Remove installer-matrix.yml
1 parent 03995ed commit 583b3d2

File tree

3 files changed

+16
-25
lines changed

3 files changed

+16
-25
lines changed

eng/pipelines/installer/installer-matrix.yml

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

eng/pipelines/runtime.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -846,8 +846,9 @@ jobs:
846846
# These are always built since they only take like 15 minutes
847847
# we expect these to be done before we finish libraries or coreclr testing.
848848
#
849-
- template: /eng/pipelines/installer/installer-matrix.yml
849+
- template: /eng/pipelines/common/platform-matrix.yml
850850
parameters:
851+
jobTemplate: /eng/pipelines/installer/jobs/base-job.yml
851852
buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
852853
platforms:
853854
- Linux_arm
@@ -859,9 +860,15 @@ jobs:
859860
jobParameters:
860861
liveRuntimeBuildConfig: release
861862
liveLibrariesBuildConfig: Release
863+
runOnlyIfDependenciesSucceeded: true
864+
condition:
865+
or(
866+
eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
867+
eq(variables['isRollingBuild'], true))
862868

863-
- template: /eng/pipelines/installer/installer-matrix.yml
869+
- template: /eng/pipelines/common/platform-matrix.yml
864870
parameters:
871+
jobTemplate: /eng/pipelines/installer/jobs/base-job.yml
865872
buildConfig: Release
866873
platforms:
867874
- OSX_arm64
@@ -874,6 +881,11 @@ jobs:
874881
jobParameters:
875882
liveRuntimeBuildConfig: release
876883
liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
884+
runOnlyIfDependenciesSucceeded: true
885+
condition:
886+
or(
887+
eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
888+
eq(variables['isRollingBuild'], true))
877889

878890
#
879891
# CoreCLR Test builds using live libraries release build

eng/pipelines/runtimelab.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,9 @@ stages:
121121

122122
# Installer official builds need to build installers and need the libraries all configurations build
123123
- ${{ if eq(variables.isOfficialBuild, true) }}:
124-
- template: /eng/pipelines/installer/installer-matrix.yml
124+
- template: /eng/pipelines/common/platform-matrix.yml
125125
parameters:
126+
jobTemplate: /eng/pipelines/installer/jobs/base-job.yml
126127
jobParameters:
127128
liveRuntimeBuildConfig: Release
128129
liveLibrariesBuildConfig: Release

0 commit comments

Comments
 (0)