Skip to content

Commit d45ff6a

Browse files
authored
Switch to our custom images for build and release (PowerShell#16801)
1 parent 5e005b8 commit d45ff6a

21 files changed

+36
-28
lines changed

build.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1938,7 +1938,7 @@ function Start-PSBootstrap {
19381938
elseif ($environment.IsUbuntu18) { $Deps += "libicu60"}
19391939

19401940
# Packaging tools
1941-
if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev" }
1941+
if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev", "rpm" }
19421942

19431943
# Install dependencies
19441944
# change the fontend from apt-get to noninteractive

tools/packaging/packaging.psm1

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,15 @@ function New-UnixPackage {
10191019
try {
10201020
if ($PSCmdlet.ShouldProcess("Create $type package")) {
10211021
Write-Log "Creating package with fpm..."
1022-
$Output = Start-NativeExecution { fpm $Arguments }
1022+
try {
1023+
$Output = Start-NativeExecution { fpm $Arguments }
1024+
}
1025+
catch {
1026+
Write-Verbose -Message "!!!Handling error in FPM!!!" -Verbose -ErrorAction SilentlyContinue
1027+
Write-Verbose -Message "$Output" -Verbose -ErrorAction SilentlyContinue
1028+
Get-Error -InputObject $_
1029+
throw
1030+
}
10231031
}
10241032
} finally {
10251033
if ($Environment.IsMacOS) {
@@ -4149,7 +4157,7 @@ function Invoke-AzDevOpsLinuxPackageCreation {
41494157
}
41504158
}
41514159
catch {
4152-
Get-Error
4160+
Get-Error -InputObject $_
41534161
throw
41544162
}
41554163
}
@@ -4230,7 +4238,7 @@ function Invoke-AzDevOpsLinuxPackageBuild {
42304238
}
42314239
}
42324240
catch {
4233-
Get-Error
4241+
Get-Error -InputObject $_
42344242
throw
42354243
}
42364244
}

tools/releaseBuild/azureDevOps/releaseBuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ stages:
207207
pool:
208208
name: PowerShell1ES
209209
demands:
210-
- ImageOverride -equals MMS2019TLS
210+
- ImageOverride -equals PSMMS2019-Secure
211211
steps:
212212
- checkout: self
213213
clean: true

tools/releaseBuild/azureDevOps/releasePipeline.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ stages:
179179

180180
pool: PowerShell1ES
181181
demands:
182-
- ImageOverride -equals MMS2019TLS
182+
- ImageOverride -equals PSMMS2019-Secure
183183

184184
variables:
185185
- group: 'Staging_ACR'
@@ -195,7 +195,7 @@ stages:
195195

196196
pool: PowerShell1ES
197197
demands:
198-
- ImageOverride -equals MMS2019TLS
198+
- ImageOverride -equals PSMMS2019-Secure
199199

200200
variables:
201201
- group: 'Azure Blob variable group'
@@ -231,7 +231,7 @@ stages:
231231

232232
pool: PowerShell1ES
233233
demands:
234-
- ImageOverride -equals MMS2019TLS
234+
- ImageOverride -equals PSMMS2019-Secure
235235

236236
steps:
237237
- template: templates/release-ReleaseToNuGet.yml
@@ -240,7 +240,7 @@ stages:
240240

241241
pool: PowerShell1ES
242242
demands:
243-
- ImageOverride -equals MMSUbuntu20.04TLS
243+
- ImageOverride -equals PSMMSUbuntu20.04-Secure
244244

245245
variables:
246246
- group: 'AzDevOpsArtifacts'
@@ -337,7 +337,7 @@ stages:
337337

338338
pool: PowerShell1ES
339339
demands:
340-
- ImageOverride -equals MMS2019TLS
340+
- ImageOverride -equals PSMMS2019-Secure
341341

342342
variables:
343343
- group: 'Azure Blob variable group'

tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
pool:
1111
name: PowerShell1ES
1212
demands:
13-
- ImageOverride -equals MMS2019TLS
13+
- ImageOverride -equals PSMMS2019-Secure
1414
steps:
1515
- checkout: self
1616
clean: true

tools/releaseBuild/azureDevOps/templates/compliance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pool:
1919
name: PowerShell1ES
2020
demands:
21-
- ImageOverride -equals MMS2019TLS
21+
- ImageOverride -equals PSMMS2019-Secure
2222

2323
# APIScan can take a long time
2424
timeoutInMinutes: 180

tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
pool:
2020
name: PowerShell1ES
2121
demands:
22-
- ImageOverride -equals MMS2019TLS
22+
- ImageOverride -equals PSMMS2019-Secure
2323

2424
# APIScan can take a long time
2525
timeoutInMinutes: 180

tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
pool:
1717
name: PowerShell1ES
1818
demands:
19-
- ImageOverride -equals MMS2019TLS
19+
- ImageOverride -equals PSMMS2019-Secure
2020

2121
timeoutInMinutes: 15
2222

tools/releaseBuild/azureDevOps/templates/json.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
pool:
1616
name: PowerShell1ES
1717
demands:
18-
- ImageOverride -equals MMS2019TLS
18+
- ImageOverride -equals PSMMS2019-Secure
1919

2020
steps:
2121
#- task: <task type name>@<version>

tools/releaseBuild/azureDevOps/templates/linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
pool:
1111
name: PowerShell1ES
1212
demands:
13-
- ImageOverride -equals MMSUbuntu20.04TLS
13+
- ImageOverride -equals PSMMSUbuntu20.04-Secure
1414
dependsOn: ${{ parameters.parentJob }}
1515
variables:
1616
- name: runCodesignValidationInjection
@@ -151,7 +151,7 @@ jobs:
151151
pool:
152152
name: PowerShell1ES
153153
demands:
154-
- ImageOverride -equals MMS2019TLS
154+
- ImageOverride -equals PSMMS2019-Secure
155155
variables:
156156
- name: buildName
157157
value: ${{ parameters.buildName }}

0 commit comments

Comments
 (0)