[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#20006)

dotnet · Jul 15, 2024 · 1d313fc · 1d313fc
2 parents 1fdb25a + 37cd9d4
commit 1d313fc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 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
@@ -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
@@ -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()