From 98554660165f683347e13028bcbee7c74c3b0d2f Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 18 Jan 2022 12:26:31 -0800
Subject: [PATCH 1/2] ensure bom generation matches the artifact conditions.
 unless cancelled, it'll always be generated and uploaded

---
 eng/pipelines/templates/jobs/archetype-sdk-client.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 6d03482e23..981dd77741 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -213,6 +213,7 @@ jobs:
 
         - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
           displayName: 'Generate BOM'
+          condition: succeededOrFailed()
           inputs:
             BuildDropPath: $(Build.SourcesDirectory)/build
 

From ada7ee946c89e2f6aa6c8ecdf63d9a2e9fef5517 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Tue, 18 Jan 2022 12:33:39 -0800
Subject: [PATCH 2/2] ensure bom upload always succeeds

---
 eng/pipelines/templates/jobs/ci.tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml
index 56e091373f..6c4e87008f 100644
--- a/eng/pipelines/templates/jobs/ci.tests.yml
+++ b/eng/pipelines/templates/jobs/ci.tests.yml
@@ -239,9 +239,11 @@ jobs:
           }
           Write-Host "##vso[task.setvariable variable=BomArtifactName;]$artifactName"
         displayName: Set bom file artifact name
+        condition: succeededOrFailed()
 
       - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
         displayName: 'Generate BOM'
+        condition: succeededOrFailed()
         inputs:
           BuildDropPath: $(Build.ArtifactStagingDirectory)