Skip to content

Commit 94793ad

Browse files
author
Eduardo Manuel Velarde Polar
committed
Use isOfficialBuild
1 parent e2eba88 commit 94793ad

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

eng/common/templates/job/job.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ parameters:
1616
variables: []
1717
workspace: ''
1818
templateContext: ''
19-
templatePath: 'templates'
19+
isOfficialBuild: false
2020

2121
# Job base template specific parameters
2222
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
@@ -247,11 +247,18 @@ jobs:
247247
condition: always()
248248

249249
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
250-
- template: /eng/common/${{ parameters.templatePath }}/steps/generate-sbom.yml
251-
parameters:
252-
PackageVersion: ${{ parameters.packageVersion}}
253-
BuildDropPath: ${{ parameters.buildDropPath }}
254-
IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
250+
- ${{ if eq(parameters.isOfficialBuild, true) }}:
251+
- template: /eng/common/templates/steps/generate-sbom.yml
252+
parameters:
253+
PackageVersion: ${{ parameters.packageVersion}}
254+
BuildDropPath: ${{ parameters.buildDropPath }}
255+
IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
256+
- ${{ if ne(parameters.isOfficialBuild, true) }}:
257+
- template: /eng/common/templates-official/steps/generate-sbom.yml
258+
parameters:
259+
PackageVersion: ${{ parameters.packageVersion}}
260+
BuildDropPath: ${{ parameters.buildDropPath }}
261+
IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
255262

256263
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
257264
- publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
helixType: 'build/product/'
5151
enableMicrobuild: true
5252
pool: ${{ parameters.pool }}
53+
isOfficialBuild: ${{ parameters.isOfficialBuild }}
5354

5455
${{ if eq(parameters.runOnlyIfDependenciesSucceeded, true) }}:
5556
condition: and(succeeded(), ${{ parameters.condition }})

eng/pipelines/libraries/base-job.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ jobs:
4040
condition: and(succeeded(), ${{ parameters.condition }})
4141
helixRepo: dotnet/runtime
4242
pool: ${{ parameters.pool }}
43-
44-
${{ if parameters.isOfficialBuild }}:
45-
templatePath: 'templates-official'
46-
${{ else }}:
47-
templatePath: 'templates'
43+
isOfficialBuild: ${{ parameters.isOfficialBuild }}
4844

4945
# Disable component governance if requested or on musl machines where it does not work well
5046
${{ if or(eq(parameters.disableComponentGovernance, true), eq(parameters.osSubGroup, '_musl')) }}:

0 commit comments

Comments
 (0)