Skip to content

Commit 2c46e3b

Browse files
adityapatwardhanTravisEz13
authored andcommitted
Fix azure file copy issues in release build (PowerShell#13182)
Co-authored-by: Aditya Patwardhan <Aditya Patwardhan> # Conflicts: # tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
1 parent 81c83a9 commit 2c46e3b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

tools/releaseBuild/azureDevOps/templates/linux.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
- task: AzureFileCopy@4
113113
displayName: 'Upload to Azure - DEB and tar.gz'
114114
inputs:
115-
SourcePath: '$(System.ArtifactsDirectory)\finished\release'
115+
SourcePath: '$(System.ArtifactsDirectory)\finished\release\*'
116116
azureSubscription: '$(AzureFileCopySubscription)'
117117
Destination: AzureBlob
118118
storage: '$(StorageAccount)'
@@ -125,7 +125,7 @@ jobs:
125125
- task: AzureFileCopy@4
126126
displayName: 'Upload to Azure - RPM - Unsigned'
127127
inputs:
128-
SourcePath: '$(System.ArtifactsDirectory)\rpm\release'
128+
SourcePath: '$(System.ArtifactsDirectory)\rpm\release\*'
129129
azureSubscription: '$(AzureFileCopySubscription)'
130130
Destination: AzureBlob
131131
storage: '$(StorageAccount)'
@@ -135,7 +135,7 @@ jobs:
135135
- task: AzureFileCopy@4
136136
displayName: 'Upload to Azure - RPM - Signed'
137137
inputs:
138-
SourcePath: '$(Build.StagingDirectory)\signedPackages'
138+
SourcePath: '$(Build.StagingDirectory)\signedPackages\*'
139139
azureSubscription: '$(AzureFileCopySubscription)'
140140
Destination: AzureBlob
141141
storage: '$(StorageAccount)'

tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ jobs:
6868
$destination = "$(System.ArtifactsDirectory)\azureMacOs"
6969
New-Item -Path $destination -Type Directory
7070
$zipPath = dir "$(Build.StagingDirectory)\signedMacOSPackages\powershell-*.zip" -Recurse | select-object -expandproperty fullname
71-
Expand-Archive -Path $zipPath -DestinationPath $destination
72-
$targzPath = dir "$(System.ArtifactsDirectory)\*.tar.gz" -Recurse | select-object -expandproperty fullname
71+
foreach ($z in $zipPath) { Expand-Archive -Path $z -DestinationPath $destination }
72+
$targzPath = dir "$(System.ArtifactsDirectory)\*osx*.tar.gz" -Recurse | select-object -expandproperty fullname
7373
Copy-Item -Path $targzPath -Destination $destination
7474
displayName: 'Extract and copy macOS artifacts for upload'
7575
condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
@@ -90,7 +90,7 @@ jobs:
9090
- task: AzureFileCopy@4
9191
displayName: 'AzureBlob File Copy - unsigned'
9292
inputs:
93-
SourcePath: '$(Build.StagingDirectory)\macos-unsigned'
93+
SourcePath: '$(Build.StagingDirectory)\macos-unsigned\*'
9494
azureSubscription: '$(AzureFileCopySubscription)'
9595
Destination: AzureBlob
9696
storage: '$(StorageAccount)'
@@ -100,7 +100,7 @@ jobs:
100100
- task: AzureFileCopy@4
101101
displayName: 'AzureBlob File Copy - signed'
102102
inputs:
103-
SourcePath: '$(System.ArtifactsDirectory)\azureMacOs'
103+
SourcePath: '$(System.ArtifactsDirectory)\azureMacOs\*'
104104
azureSubscription: '$(AzureFileCopySubscription)'
105105
Destination: AzureBlob
106106
storage: '$(StorageAccount)'

tools/releaseBuild/azureDevOps/templates/nuget.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ jobs:
205205
- task: AzureFileCopy@4
206206
displayName: 'Upload NuGet packages to Azure'
207207
inputs:
208-
SourcePath: '$(System.ArtifactsDirectory)\signed\'
208+
SourcePath: '$(System.ArtifactsDirectory)\signed\*'
209209
azureSubscription: '$(AzureFileCopySubscription)'
210210
Destination: AzureBlob
211211
storage: '$(StorageAccount)'
@@ -215,7 +215,7 @@ jobs:
215215
- task: AzureFileCopy@4
216216
displayName: 'Upload global tool packages to Azure'
217217
inputs:
218-
sourcePath: '$(System.ArtifactsDirectory)\signed\globaltool'
218+
sourcePath: '$(System.ArtifactsDirectory)\signed\globaltool\*'
219219
azureSubscription: '$(GlobalToolSubscription)'
220220
Destination: AzureBlob
221221
storage: '$(GlobalToolStorageAccount)'

0 commit comments

Comments
 (0)