Skip to content

Commit

Permalink
Rebase the installer build jobs on the global build job template (dot…
Browse files Browse the repository at this point in the history
  • Loading branch information
jkoritzinsky authored and matouskozak committed Apr 30, 2024
1 parent 886c7a7 commit b2d7d06
Show file tree
Hide file tree
Showing 9 changed files with 151 additions and 369 deletions.
15 changes: 13 additions & 2 deletions eng/pipelines/common/global-build-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ parameters:
targetRid: ''
timeoutInMinutes: ''
dependsOn: []
# The following parameter is used to specify dependencies on other global build for the same platform.
# We provide this mechanism to allow for global builds to depend on other global builds and use the multiplexing
# that platform-matrix.yml enables.
# Each item can have the following properties:
# - nameSuffix: The suffix of the job name to depend on.
# - buildConfig: The configuration of the job to depend on.
dependsOnGlobalBuilds: []
pool: ''
platform: ''
condition: true
Expand Down Expand Up @@ -62,8 +69,12 @@ jobs:
workspace:
clean: all

${{ if ne(parameters.dependsOn,'') }}:
dependsOn: ${{ parameters.dependsOn }}
${{ if or(ne(parameters.dependsOn,''), ne(parameters.dependsOnGlobalBuilds,'')) }}:
dependsOn:
- ${{ each build in parameters.dependsOn }}:
- ${{ build }}
- ${{ each globalBuild in parameters.dependsOnGlobalBuilds }}:
- ${{ format('build_{0}{1}_{2}_{3}_{4}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(globalBuild.buildConfig, parameters.buildConfig), globalBuild.nameSuffix) }}

variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
Expand Down
5 changes: 4 additions & 1 deletion eng/pipelines/common/templates/global-build-step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ parameters:
useContinueOnErrorDuringBuild: false
shouldContinueOnError: false
archParameter: $(_archParameter)
crossArg: $(crossArg)
displayName: Build product
container: ''
condition: succeeded()

steps:
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) $(crossArg) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) ${{ parameters.crossArg }} ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
displayName: ${{ parameters.displayName }}
${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
continueOnError: ${{ parameters.shouldContinueOnError }}
${{ if ne(parameters.container, '') }}:
target: ${{ parameters.container }}
condition: ${{ parameters.condition }}
248 changes: 0 additions & 248 deletions eng/pipelines/installer/jobs/build-job.yml

This file was deleted.

31 changes: 0 additions & 31 deletions eng/pipelines/installer/jobs/steps/build-linux-package.yml

This file was deleted.

65 changes: 0 additions & 65 deletions eng/pipelines/installer/jobs/steps/upload-job-artifacts.yml

This file was deleted.

Loading

0 comments on commit b2d7d06

Please sign in to comment.