Skip to content

Update Manifest Publishing #22476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scbedd merged 3 commits into from
Jan 14, 2022
Merged

Update Manifest Publishing #22476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d84009c
properly update bom update steps
scbedd Jan 14, 2022
637b2e3
manifest drop path did not exist
scbedd Jan 14, 2022
778bee8
ensure conda manifest generates to a different location that actually…
scbedd Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions eng/pipelines/templates/steps/build-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,6 @@ steps:

- ${{ parameters.BeforePublishSteps }}

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'Upload Package SBOM'
inputs:
BuildDropPath: $(Build.ArtifactStagingDirectory)

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'Upload Documentation SBOM'
condition: and(succeeded(), ${{ parameters.BuildDocs }})
inputs:
BuildDropPath: $(Build.SourcesDirectory)/_docs

- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
parameters:
ArtifactPath: '$(Build.ArtifactStagingDirectory)'
Expand All @@ -121,4 +110,15 @@ steps:
parameters:
ArtifactPath: '$(Build.SourcesDirectory)/_docs'
CustomCondition: ${{ parameters.BuildDocs }}
ArtifactName: 'documentation'
ArtifactName: 'documentation'

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'Generate BOM'
inputs:
BuildDropPath: $(Build.ArtifactStagingDirectory)

- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
parameters:
ArtifactPath: '$(Build.ArtifactStagingDirectory)/_manifest'
ArtifactName: 'manifest'

12 changes: 9 additions & 3 deletions eng/pipelines/templates/steps/build-conda-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ steps:
mkdir $(Agent.BuildDirectory)/conda/
mkdir $(Agent.BuildDirectory)/conda/output
mkdir $(Agent.BuildDirectory)/conda/build
mkdir $(Agent.BuildDirectory)/conda/manifest

Write-Host "##vso[task.setvariable variable=conda.output]$(Agent.BuildDirectory)/conda/output"
Write-Host "##vso[task.setvariable variable=conda.build]$(Agent.BuildDirectory)/conda/build"
Expand Down Expand Up @@ -78,12 +79,17 @@ steps:
displayName: 'Activate Conda Environment and Build ${{ artifact.name }}'
workingDirectory: $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }}/conda-recipe

- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
parameters:
ArtifactPath: '$(Agent.BuildDirectory)/conda/output'
ArtifactName: 'conda'

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'Upload Conda Package SBOM'
inputs:
BuildDropPath: '$(Agent.BuildDirectory)/conda/output'
BuildDropPath: '$(Agent.BuildDirectory)/conda/manifest'

- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
parameters:
ArtifactPath: '$(Agent.BuildDirectory)/conda/output'
ArtifactName: 'conda'
ArtifactPath: '$(Agent.BuildDirectory)/conda/manifest/_manifest'
ArtifactName: 'conda_manifest'