Skip to content

Commit ac2ac74

Browse files
authored
Disable SBOM for non-folder publish and fix SymbolUpload Warning (#1540)
Disable SBOM for non-folder publish and other warnings This PR disables SBOM for non-folder publishes because the build will get a warning saying: "BuildDropPath '<FILE PATH>' must be a directory, not a file" Disabling SBOM checks where we know we are only publishing a file. Changing ExpirationInDays to be 5475
1 parent 5078abe commit ac2ac74

File tree

7 files changed

+9
-1
lines changed

7 files changed

+9
-1
lines changed

eng/pipelines/steps/BuildSolution.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ steps:
3939
artifactName: '${{ parameters.Configuration }}_binlog'
4040
condition: ne(variables['System.Debug'], '')
4141
OneESPT: ${{ parameters.OneESPT }}
42+
sbomEnabled: false # Disable SBOM for binlogs
4243

4344
- template: ../tasks/1ES/PublishPipelineArtifact.yml
4445
parameters:
@@ -47,4 +48,5 @@ steps:
4748
artifactName: '${{ parameters.Configuration }}_debug_bin'
4849
condition: ne(variables['System.Debug'], '')
4950
OneESPT: ${{ parameters.OneESPT }}
51+
sbomEnabled: false # Disable SBOM for binaries for System.Debug runs
5052
...

eng/pipelines/steps/CopyAndPublishSymbols.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ steps:
2323
SymbolsAgentPath: '$(Build.ArtifactStagingDirectory)\Symbols\'
2424
ExcludeAgentFolders: '$(Build.ArtifactStagingDirectory)\Symbols\Debug;$(Build.ArtifactStagingDirectory)\Symbols\Lab.Debug'
2525
${{ if parameters.OneESPT }}:
26-
ExpirationInDays: 3650 # Expire in 10 years for release builds
26+
ExpirationInDays: 5475 # Expire in 10 years for release builds
2727
${{ else }}:
2828
ExpirationInDays: 1 # Expire in 1 day if used for testing
2929
env:

eng/pipelines/steps/PublishOpenDebugAD7.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,4 @@ steps:
5959
targetPath: '$(Build.StagingDirectory)\zips\${{ parameters.RuntimeID }}.zip'
6060
artifactName: '${{ parameters.RuntimeID }}_zip'
6161
OneESPT: true
62+
sbomEnabled: false # Disable SBOM for zipped files

eng/pipelines/steps/PublishVSPackages.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ steps:
1818
targetPath: '$(Build.SourcesDirectory)\obj\Lab.Release\NugetPackageVersion.txt'
1919
artifactName: 'PackageVersion'
2020
OneESPT: true
21+
sbomEnabled: false # Disable SBOM for version file
2122

2223
- task: CopyFiles@2
2324
inputs:

eng/pipelines/tasks/1ES/PublishPipelineArtifact.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ parameters:
55
artifactName: 'drop'
66
condition: 'succeeded()'
77
OneESPT: false # Indicates that this is running under the 1ES Pipeline Template
8+
sbomEnabled: true
89

910
steps:
1011
- ${{ if eq(parameters['OneESPT'], true) }}:
@@ -13,6 +14,7 @@ steps:
1314
inputs:
1415
targetPath: ${{ parameters.targetPath }}
1516
artifactName: '${{ parameters.artifactName }}'
17+
sbomEnabled: ${{ parameters.sbomEnabled }}
1618
condition: ${{ parameters.condition }}
1719
- ${{ else }}:
1820
- template: ../PublishPipelineArtifact.yml

eng/pipelines/templates/VSCode-codesign-osx.template.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ steps:
2828
targetPath: '$(Pipeline.Workspace)/${{ rid }}.zip'
2929
artifactName: 'unsigned_${{ rid }}_zip'
3030
OneESPT: true
31+
sbomEnabled: false # Disable SBOM for zipped files
3132
...

eng/pipelines/templates/VSCode-esrp-sign-osx.template.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ steps:
2525
targetPath: '$(Pipeline.Workspace)\Artifacts\${{ rid }}.zip'
2626
artifactName: '${{ rid }}_zip'
2727
OneESPT: true
28+
sbomEnabled: false # Disable SBOM for zipped files
2829
...

0 commit comments

Comments
 (0)