Skip to content

Commit b2d7d06

Browse files
jkoritzinskymatouskozak
authored andcommitted
Rebase the installer build jobs on the global build job template (dotnet#100110)
1 parent 886c7a7 commit b2d7d06

9 files changed

+151
-369
lines changed

eng/pipelines/common/global-build-job.yml

+13-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ parameters:
1212
targetRid: ''
1313
timeoutInMinutes: ''
1414
dependsOn: []
15+
# The following parameter is used to specify dependencies on other global build for the same platform.
16+
# We provide this mechanism to allow for global builds to depend on other global builds and use the multiplexing
17+
# that platform-matrix.yml enables.
18+
# Each item can have the following properties:
19+
# - nameSuffix: The suffix of the job name to depend on.
20+
# - buildConfig: The configuration of the job to depend on.
21+
dependsOnGlobalBuilds: []
1522
pool: ''
1623
platform: ''
1724
condition: true
@@ -62,8 +69,12 @@ jobs:
6269
workspace:
6370
clean: all
6471

65-
${{ if ne(parameters.dependsOn,'') }}:
66-
dependsOn: ${{ parameters.dependsOn }}
72+
${{ if or(ne(parameters.dependsOn,''), ne(parameters.dependsOnGlobalBuilds,'')) }}:
73+
dependsOn:
74+
- ${{ each build in parameters.dependsOn }}:
75+
- ${{ build }}
76+
- ${{ each globalBuild in parameters.dependsOnGlobalBuilds }}:
77+
- ${{ format('build_{0}{1}_{2}_{3}_{4}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(globalBuild.buildConfig, parameters.buildConfig), globalBuild.nameSuffix) }}
6778

6879
variables:
6980
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:

eng/pipelines/common/templates/global-build-step.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ parameters:
33
useContinueOnErrorDuringBuild: false
44
shouldContinueOnError: false
55
archParameter: $(_archParameter)
6+
crossArg: $(crossArg)
67
displayName: Build product
78
container: ''
9+
condition: succeeded()
810

911
steps:
10-
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) $(crossArg) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
12+
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) ${{ parameters.crossArg }} ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
1113
displayName: ${{ parameters.displayName }}
1214
${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
1315
continueOnError: ${{ parameters.shouldContinueOnError }}
1416
${{ if ne(parameters.container, '') }}:
1517
target: ${{ parameters.container }}
18+
condition: ${{ parameters.condition }}

eng/pipelines/installer/jobs/build-job.yml

-248
This file was deleted.

eng/pipelines/installer/jobs/steps/build-linux-package.yml

-31
This file was deleted.

eng/pipelines/installer/jobs/steps/upload-job-artifacts.yml

-65
This file was deleted.

0 commit comments

Comments
 (0)