@@ -271,7 +271,7 @@ extends:
271271 targetPath : $(System.DefaultWorkingDirectory)/signed
272272 artifactName : ' azcopy-linux-signed'
273273 displayName : ' Upload Linux Signed'
274- sbomBuildDropPath : $(Build.ArtifactStagingDirectory)/azcopy-linux- signed
274+ sbomBuildDropPath : $(System.DefaultWorkingDirectory)/ signed
275275
276276 variables :
277277 - group : AZCOPY_SECRET_VAULT
@@ -326,12 +326,21 @@ extends:
326326 chmod 755 $(amd64)/*
327327 rm -rf $(amd64)/*.md
328328 mv $(amd64)/* $(signed)
329+ if [ -d "$(amd64)/_manifest" ]; then
330+ mv $(amd64)/_manifest $(signed)/
331+ fi
329332 chmod 755 $(arm64)/*
330333 rm -rf $(arm64)/*.md
331334 mv $(arm64)/* $(signed)
335+ if [ -d "$(arm64)/_manifest" ]; then
336+ mv $(arm64)/_manifest $(signed)/
337+ fi
332338 chmod 755 $(mariner)/*
333339 rm -rf $(mariner)/*.md
334340 mv $(mariner)/* $(signed)/mariner
341+ if [ -d "$(mariner)/_manifest" ]; then
342+ mv $(mariner)/_manifest $(signed)/mariner/
343+ fi
335344 displayName: 'Make Artifacts executable'
336345
337346 - job : Windows
@@ -352,7 +361,7 @@ extends:
352361 targetPath : $(System.DefaultWorkingDirectory)/signed
353362 artifactName : ' azcopy-windows-signed'
354363 displayName : ' Upload Windows Signed'
355- sbomBuildDropPath : $(Build.ArtifactStagingDirectory)/azcopy-windows- signed
364+ sbomBuildDropPath : $(System.DefaultWorkingDirectory)/ signed
356365 - output : pipelineArtifact
357366 targetPath : $(System.DefaultWorkingDirectory)/binaries
358367 artifactName : ' azcopy-binaries-windows'
@@ -410,10 +419,19 @@ extends:
410419 rm -rf $(windows)/azcopy_windows_v7_arm.exe
411420 mv $(windows)/azcopy_windows_amd64.exe $(windows_amd64)/azcopy.exe
412421 cp NOTICE.txt $(windows_amd64)
422+ if [ -d "$(windows_amd64)/_manifest" ]; then
423+ mv $(windows_amd64)/_manifest $(windows_amd64)/
424+ fi
413425 mv $(windows)/azcopy_windows_arm64.exe $(windows_arm64)/azcopy.exe
414426 cp NOTICE.txt $(windows_arm64)
427+ if [ -d "$(windows_arm64)/_manifest" ]; then
428+ mv $(windows_arm64)/_manifest $(windows_arm64)/
429+ fi
415430 mv $(windows)/azcopy_windows_386.exe $(windows_386)/azcopy.exe
416431 cp NOTICE.txt $(windows_386)
432+ if [ -d "$(windows_386)/_manifest" ]; then
433+ mv $(windows_386)/_manifest $(windows_386)/
434+ fi
417435 displayName: 'Copy required files'
418436
419437 - task : ArchiveFiles@2
@@ -456,7 +474,7 @@ extends:
456474 targetPath : $(System.DefaultWorkingDirectory)/signed
457475 artifactName : ' azcopy-mac-signed'
458476 displayName : ' Upload Mac Signed'
459- sbomBuildDropPath : $(Build.ArtifactStagingDirectory)/azcopy-mac- signed
477+ sbomBuildDropPath : $(System.DefaultWorkingDirectory)/ signed
460478 - output : pipelineArtifact
461479 targetPath : $(System.DefaultWorkingDirectory)/binaries
462480 artifactName : ' azcopy-binaries-mac'
@@ -510,7 +528,13 @@ extends:
510528
511529 - script : |
512530 mv $(mac)/azcopy* $(signed)/
531+ if [ -d "$(mac)/_manifest" ]; then
532+ mv $(mac)/_manifest $(signed)/
533+ fi
513534 mv $(mac-m1)/azcopy* $(signed)/
535+ if [ -d "$(mac-m1)/_manifest" ]; then
536+ mv $(mac-m1)/_manifest $(signed)/
537+ fi
514538 displayName: 'Copy required files'
515539
516540 - script : |
0 commit comments