From 8474c4c69c560eb69742cf8575eae0777b12e5ab Mon Sep 17 00:00:00 2001
From: Scott Beddall <45376673+scbedd@users.noreply.github.com>
Date: Tue, 18 Jan 2022 15:26:55 -0800
Subject: [PATCH] Fix BOM artifact upload failure on failed cmake (#3256)

* 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 +
 eng/pipelines/templates/jobs/ci.tests.yml             | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 6d03482e2..981dd7774 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
 
diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml
index 56e091373..6c4e87008 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)