diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml index 91ab400d8c..57208f26ce 100644 --- a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml +++ b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml @@ -38,16 +38,19 @@ jobs: - task: DownloadBuildArtifacts@0 + displayName: Download macosBinResults inputs: artifactName: 'macosBinResults' itemPattern: '**/*.zip' downloadPath: '$(System.ArtifactsDirectory)/Symbols' - task: DownloadBuildArtifacts@0 + displayName: Download signedMacOsBins inputs: artifactName: 'signedMacOsBins' itemPattern: '**/*' downloadPath: '$(System.ArtifactsDirectory)/macOsBins' + condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')) - pwsh: | Get-ChildItem "$(System.ArtifactsDirectory)\*" -Recurse diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml index 38189617a3..db3a8ba3db 100644 --- a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml +++ b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml @@ -93,8 +93,8 @@ jobs: - pwsh: | $null = new-item -type directory -path "$(Build.StagingDirectory)\macos-unsigned" - Copy-Item -Path "$(System.ArtifactsDirectory)\results\powershell-$(Version)-osx-x64.pkg" -Destination "$(Build.StagingDirectory)\macos-unsigned" - Copy-Item -Path "$(System.ArtifactsDirectory)\results\powershell-$(Version)-osx-x64.tar.gz" -Destination "$(Build.StagingDirectory)\macos-unsigned" + Copy-Item -Path "$(System.ArtifactsDirectory)\macosPkgResults\powershell-$(Version)-osx-x64.pkg" -Destination "$(Build.StagingDirectory)\macos-unsigned" + Copy-Item -Path "$(System.ArtifactsDirectory)\macosPkgResults\powershell-$(Version)-osx-x64.tar.gz" -Destination "$(Build.StagingDirectory)\macos-unsigned" displayName: 'Create unsigned folder to upload' condition: and(succeeded(), ne(variables['SHOULD_SIGN'], 'true')) diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml index a1fad655c5..7c1a6adadd 100644 --- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml +++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml @@ -126,7 +126,7 @@ jobs: outPathRoot: '$(System.ArtifactsDirectory)\signed' condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')) - - powershell: | + - pwsh: | New-Item -ItemType Directory -Path $(System.ArtifactsDirectory)\signed -Force displayName: 'Create empty signed folder' condition: and(succeeded(), ne(variables['SHOULD_SIGN'], 'true'))