@@ -522,11 +522,11 @@ jobs:
522522 customPrepArgs="${customPrepArgs} --no-sdk --no-bootstrap"
523523 prepSdk=false
524524 elif [[ '${{ length(parameters.reuseBuildArtifactsFrom) }}' -gt '0' ]]; then
525- # Don't use --no-artifacts because it will prevent the shared components archive from being
526- # downloaded in non-1xx branches. It's ok to not provide this option since the downloading
527- # of the PSB artifacts will be skipped anyway because we've already manually copied the file
528- # to use at the expected location.
529- customPrepArgs="${customPrepArgs} --no-sdk"
525+ # Don't use --no-artifacts because it will prevent the shared components archive from being
526+ # downloaded in non-1xx branches. It's ok to not provide this option since the downloading
527+ # of the PSB artifacts will be skipped anyway because we've already manually copied the file
528+ # to use at the expected location.
529+ customPrepArgs="${customPrepArgs} --no-sdk"
530530 prepSdk=false
531531 fi
532532
@@ -614,21 +614,13 @@ jobs:
614614 env:
615615 SYSTEM_ACCESSTOKEN: $(System.AccessToken)
616616
617- - ${{ if ne(parameters.runOnline, 'True' )}} :
618- - script : |
619- set -ex
620- # Update the owner of the staging directory to the current user
621- sudo chown -R $(whoami) $(Build.ArtifactStagingDirectory)
622- displayName: Update owner of artifacts staging directory
623-
624- - script : |
625- if [[ -d "$(Build.ArtifactStagingDirectory)/artifacts/assets/${{ parameters.configuration }}/source-build" ]]; then
626- rm -rf $(Build.ArtifactStagingDirectory)/artifacts/assets/${{ parameters.configuration }}/source-build
627- fi
628- displayName: Clean up unwanted Source Build Artifacts
629- continueOnError: true
630- condition: succeededOrFailed()
631-
617+ - ${{ if ne(parameters.runOnline, 'True' )}} :
618+ - script : |
619+ set -ex
620+ # Update the owner of the staging directory to the current user
621+ sudo chown -R $(whoami) $(Build.ArtifactStagingDirectory)
622+ displayName: Update owner of artifacts staging directory
623+
632624 # Only run tests if enabled
633625 - ${{ if eq(parameters.runTests, 'True') }} :
634626 - ${{ parameters.testInitSteps }}
@@ -769,3 +761,4 @@ jobs:
769761 PathtoPublish : $(Build.ArtifactStagingDirectory)/artifacts/manifests/${{ parameters.configuration }}/$(Agent.JobName).xml
770762 ArtifactName : VerticalManifests
771763 displayName : Publish Vertical Manifest
764+
0 commit comments