From 37cd9d4cb1717363822828addebeaf82f5786c59 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Mon, 15 Jul 2024 16:13:48 -0500
Subject: [PATCH] Copy artifacts to publishing directory (#20005)

---
 .../templates/job/source-build-build-tarball-pr.yml      | 9 ++++++++-
 .../common/templates/job/source-build-build-tarball.yml  | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml
index f5569e26b..5e2c804e7 100644
--- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball-pr.yml
@@ -216,7 +216,14 @@ jobs:
       publishRunAttachments: true
       testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName)
 
-  - publish: '$(tarballDir)/artifacts/${{ parameters.architecture}}/Release/'
+  - task: CopyFiles@2
+    inputs:
+      SourceFolder: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/
+      TargetFolder: $(Build.ArtifactStagingDirectory)/publishing
+    displayName: Copy artifacts to Artifact Staging Directory
+    condition: succeededOrFailed()
+
+  - publish: $(Build.ArtifactStagingDirectory)/publishing
     artifact: $(Agent.JobName)_Artifacts
     displayName: Publish Artifacts
     condition: succeededOrFailed()
diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
index f13e9193b..b63317425 100644
--- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
@@ -218,10 +218,17 @@ jobs:
       publishRunAttachments: true
       testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName)
 
+  - task: CopyFiles@2
+    inputs:
+      SourceFolder: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/
+      TargetFolder: $(Build.ArtifactStagingDirectory)/publishing
+    displayName: Copy artifacts to Artifact Staging Directory
+    condition: succeededOrFailed()
+
   - task: 1ES.PublishPipelineArtifact@1
     displayName: Publish Artifacts
     inputs:
-      targetPath: $(tarballDir)/artifacts/${{ parameters.architecture}}/Release/
+      targetPath: $(Build.ArtifactStagingDirectory)/publishing
       artifactName: $(Agent.JobName)_Artifacts
     continueOnError: true
     condition: succeededOrFailed()