Fix Azure File Copy break in AzDevOps (#13173)

# Conflicts:
#	tools/releaseBuild/azureDevOps/WindowsBuild.yml
#	tools/releaseBuild/azureDevOps/templates/json.yml
#	tools/releaseBuild/azureDevOps/templates/linux.yml
#	tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
#	tools/releaseBuild/azureDevOps/templates/nuget.yml
#	tools/releaseBuild/azureDevOps/templates/upload.yml
This commit is contained in:
Travis Plunk
2020-07-14 12:28:05 -07:00
committed by Travis Plunk
parent ab7460365f
commit 79a2c79b82
8 changed files with 36 additions and 24 deletions
@@ -247,7 +247,7 @@ jobs:
dependsOn: BuildJob
condition: succeeded()
pool:
name: Package ES CodeHub Lab E
name: Package ES Standard Build
strategy:
matrix:
release-anycpu:
@@ -332,7 +332,7 @@ jobs:
continueOnError: true
condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'))
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'upload signed msi to Azure - x64'
inputs:
SourcePath: '$(Build.StagingDirectory)\signedPackages\PowerShell-$(Version)-win-x64.msi'
@@ -352,7 +352,7 @@ jobs:
displayName: '[create script] upload signed msi - x86'
continueOnError: true
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'upload signed msi to Azure - x86'
inputs:
SourcePath: '$(Build.StagingDirectory)\signedPackages\PowerShell-$(Version)-win-x86.msi'
@@ -372,7 +372,7 @@ jobs:
displayName: '[Create script] upload signed zip - x64'
continueOnError: true
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'upload signed zip to Azure - x64'
inputs:
SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-x64.zip'
@@ -392,7 +392,7 @@ jobs:
displayName: '[create script] upload signed zip - x86'
continueOnError: true
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'upload signed zip to Azure - x86'
inputs:
SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-x86.zip'
@@ -412,7 +412,7 @@ jobs:
displayName: '[create script] upload signed zip - arm'
continueOnError: true
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'upload signed zip to Azure - arm'
inputs:
SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-arm32.zip'
@@ -432,7 +432,7 @@ jobs:
displayName: '[create script] upload signed zip - arm64'
continueOnError: true
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'upload signed zip to Azure - arm64'
inputs:
SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-arm64.zip'
@@ -452,7 +452,7 @@ jobs:
displayName: '[create script] upload signed zip - fxdependent'
continueOnError: true
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'upload signed zip to Azure - fxdependent'
inputs:
SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-fxdependent.zip'
@@ -7,7 +7,7 @@ jobs:
dependsOn:
${{ parameters.parentJobs }}
pool:
name: Package ES CodeHub Lab E
name: Package ES Standard Build
# APIScan can take a long time
timeoutInMinutes: 180
@@ -20,7 +20,7 @@ jobs:
ReleaseTagVar: $(ReleaseTagVar)
CreateJson: yes
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'upload daily-build-info JSON file to Azure - ${{ parameters.architecture }}'
inputs:
SourcePath: '$(BuildInfoPath)'
@@ -49,7 +49,7 @@ jobs:
displayName: ${{ parameters.uploadDisplayName }} ${{ parameters.buildName }}
dependsOn: build_${{ parameters.buildName }}
condition: succeeded()
pool: Package ES CodeHub Lab E
pool: Package ES Standard Build
variables:
buildName: ${{ parameters.buildName }}
steps:
@@ -109,7 +109,7 @@ jobs:
binVersionOverride: $(SigningVersionOverride)
condition: and(and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'Upload to Azure - DEB and tar.gz'
inputs:
SourcePath: '$(System.ArtifactsDirectory)\finished\release'
@@ -122,7 +122,7 @@ jobs:
parameters:
artifactPath: $(System.ArtifactsDirectory)\finished\release
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'Upload to Azure - RPM - Unsigned'
inputs:
SourcePath: '$(System.ArtifactsDirectory)\rpm\release'
@@ -132,7 +132,7 @@ jobs:
ContainerName: '$(AzureVersion)'
condition: and(and(succeeded(), ne(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'Upload to Azure - RPM - Signed'
inputs:
SourcePath: '$(Build.StagingDirectory)\signedPackages'
@@ -4,7 +4,7 @@ jobs:
dependsOn: build_macOS
condition: succeeded()
pool:
name: Package ES CodeHub Lab E
name: Package ES Standard Build
variables:
BuildConfiguration: release
BuildPlatform: any cpu
@@ -97,7 +97,7 @@ jobs:
displayName: 'Create unsigned folder to upload'
condition: and(succeeded(), ne(variables['SHOULD_SIGN'], 'true'))
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'AzureBlob File Copy - unsigned'
inputs:
SourcePath: '$(Build.StagingDirectory)\macos-unsigned'
@@ -107,7 +107,7 @@ jobs:
ContainerName: '$(AzureVersion)'
condition: and(succeeded(), ne(variables['SHOULD_SIGN'], 'true'))
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'AzureBlob File Copy - signed'
inputs:
SourcePath: '$(System.ArtifactsDirectory)\azureMacOs'
@@ -162,7 +162,7 @@ jobs:
Get-ChildItem "$(System.ArtifactsDirectory)\signed\globaltool" -Recurse
displayName: Move global tool packages to subfolder and capture
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'Upload NuGet packages to Azure'
inputs:
SourcePath: '$(System.ArtifactsDirectory)\signed\'
@@ -172,7 +172,7 @@ jobs:
ContainerName: '$(AzureVersion)-nuget'
condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'Upload global tool packages to Azure'
inputs:
sourcePath: '$(System.ArtifactsDirectory)\signed\globaltool'
@@ -3,6 +3,7 @@ parameters:
version: 6.2.0
msi: yes
msix: yes
pdb: no
steps:
- template: upload-final-results.yml
@@ -11,7 +12,7 @@ steps:
artifactFilter: PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.msi
condition: and(succeeded(), eq('${{ parameters.msi }}', 'yes'))
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'upload signed msi to Azure - ${{ parameters.architecture }}'
inputs:
SourcePath: '$(Build.StagingDirectory)\signedPackages\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.msi'
@@ -26,7 +27,7 @@ steps:
artifactPath: $(System.ArtifactsDirectory)\signed
artifactFilter: PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.zip
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'upload signed zip to Azure - ${{ parameters.architecture }}'
inputs:
SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.zip'
@@ -36,18 +37,29 @@ steps:
ContainerName: '$(AzureVersion)'
condition: succeeded()
# Disable upload task as the symbols package is not currently used and we want to avoid publishing this in releases
#- task: AzureFileCopy@4
# displayName: 'upload pbd zip to Azure - ${{ parameters.architecture }}'
# inputs:
# SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-Symbols-${{ parameters.version }}-win-${{ parameters.architecture }}.zip'
# azureSubscription: '$(AzureFileCopySubscription)'
# Destination: AzureBlob
# storage: '$(StorageAccount)'
# ContainerName: '$(AzureVersion)'
# condition: and(succeeded(), eq('${{ parameters.pdb }}', 'yes'))
- template: upload-final-results.yml
parameters:
artifactPath: $(Build.StagingDirectory)\signedPackages
artifactFilter: PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.msix
condition: and(succeeded(), eq('${{ parameters.msix }}', 'yes'))
- task: AzureFileCopy@1
- task: AzureFileCopy@4
displayName: 'upload signed msix to Azure - ${{ parameters.architecture }}'
inputs:
SourcePath: '$(Build.StagingDirectory)\signedPackages\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.msix'
azureSubscription: '$(AzureFileCopySubscription)'
Destination: AzureBlob
storage: '$(StorageAccount)'
ContainerName: '$(AzureVersion)'
ContainerName: '$(AzureVersion)-private'
condition: and(succeeded(), eq('${{ parameters.msix }}', 'yes'), eq(variables['SHOULD_SIGN'], 'true'))
@@ -8,7 +8,7 @@ jobs:
${{ parameters.parentJobs }}
condition: succeeded()
pool:
name: Package ES CodeHub Lab E
name: Package ES Standard Build
variables:
BuildConfiguration: release
BuildPlatform: any cpu