From 9eca55e1f80bbfdbc7283374b9e5f63bc266ac4b Mon Sep 17 00:00:00 2001
From: Scott Beddall <45376673+scbedd@users.noreply.github.com>
Date: Fri, 14 Jan 2022 11:20:35 -0800
Subject: [PATCH] Update Manifest Publishing (#22476)

* split manifest out into its own artifact. update publishing origin locations
---
 .../templates/steps/build-artifacts.yml       | 24 +++++++++----------
 .../templates/steps/build-conda-artifacts.yml | 12 +++++++---
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/eng/pipelines/templates/steps/build-artifacts.yml b/eng/pipelines/templates/steps/build-artifacts.yml
index 7ca30ced5e89..19c66288f248 100644
--- a/eng/pipelines/templates/steps/build-artifacts.yml
+++ b/eng/pipelines/templates/steps/build-artifacts.yml
@@ -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)'
@@ -121,4 +110,15 @@ steps:
     parameters:
       ArtifactPath: '$(Build.SourcesDirectory)/_docs'
       CustomCondition: ${{ parameters.BuildDocs }}
-      ArtifactName: 'documentation'
\ No newline at end of file
+      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'
+
diff --git a/eng/pipelines/templates/steps/build-conda-artifacts.yml b/eng/pipelines/templates/steps/build-conda-artifacts.yml
index d059e3c8e3d5..2ecd4bd2248a 100644
--- a/eng/pipelines/templates/steps/build-conda-artifacts.yml
+++ b/eng/pipelines/templates/steps/build-conda-artifacts.yml
@@ -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"
@@ -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'
\ No newline at end of file