From c8658b836414bd9a144c0c71443a45b18c10dca4 Mon Sep 17 00:00:00 2001
From: Scott Beddall <45376673+scbedd@users.noreply.github.com>
Date: Fri, 9 Apr 2021 16:01:06 -0700
Subject: [PATCH] move apireview step into the analyze stage (#17924)

* move apireview step into the analyze stage, shift artifact publish to end of the job
---
 eng/pipelines/templates/steps/analyze.yml      | 18 ++++++++++--------
 .../templates/steps/build-artifacts.yml        |  6 +-----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml
index 1c7602bf4ebd..f4d95d4bd986 100644
--- a/eng/pipelines/templates/steps/analyze.yml
+++ b/eng/pipelines/templates/steps/analyze.yml
@@ -59,13 +59,6 @@ steps:
     condition: and(succeededOrFailed(), ne(variables['Build.Reason'],'PullRequest'))
     displayName: 'Component Detection'
 
-  - task: PublishPipelineArtifact@1
-    condition: succeededOrFailed()
-    displayName: 'Publish Report Artifacts'
-    inputs:
-     artifactName: reports
-     pathtoPublish: $(Build.ArtifactStagingDirectory)/reports
-
   - task: PythonScript@0
     displayName: 'Verify sdist'
     condition: and(succeededOrFailed(), ne(variables['Skip.VerifySdist'],'true'))
@@ -93,7 +86,7 @@ steps:
       TestMarkArgument: ${{ parameters.TestMarkArgument }}
 
   - task: DownloadPipelineArtifact@2
-    condition: and(succeededOrFailed(), ne(variables['Skip.ApiStubGen'],'true'))
+    condition: succeededOrFailed()
     inputs:
       artifactName: 'packages'
       targetPath: $(Build.ArtifactStagingDirectory)
@@ -119,4 +112,13 @@ steps:
       TestMarkArgument: ${{ parameters.TestMarkArgument }}
       AdditionalTestArgs: ${{parameters.AdditionalTestArgs}}
 
+  - template: /eng/common/pipelines/templates/steps/create-apireview.yml
+    parameters:
+      Artifacts: ${{ parameters.Artifacts }}
+
   - template: /eng/common/pipelines/templates/steps/eng-common-workflow-enforcer.yml
+
+  - template: /eng/common/pipelines/templates/steps/publish-artifact.yml
+    parameters:
+      ArtifactPath: '$(Build.ArtifactStagingDirectory)/reports'
+      ArtifactName: 'reports'
diff --git a/eng/pipelines/templates/steps/build-artifacts.yml b/eng/pipelines/templates/steps/build-artifacts.yml
index b06f24b62e25..98384264a4ce 100644
--- a/eng/pipelines/templates/steps/build-artifacts.yml
+++ b/eng/pipelines/templates/steps/build-artifacts.yml
@@ -91,8 +91,4 @@ steps:
     parameters:
       ArtifactPath: '$(Build.SourcesDirectory)/_docs'
       CustomCondition: ${{ parameters.BuildDocs }}
-      ArtifactName: 'documentation'
-
-  - template: /eng/common/pipelines/templates/steps/create-apireview.yml
-    parameters:
-      Artifacts: ${{ parameters.Artifacts }}
+      ArtifactName: 'documentation'
\ No newline at end of file