8000 Switch to our custom images for build and release (#16801) · daxian-dbw/PowerShell@ef5caa0 · GitHub
[go: up one dir, main page]
Skip to content

Commit ef5caa0

Browse files
TravisEz13TravisEz13
committed
Switch to our custom images for build and release (PowerShell#16801)
# Conflicts: # tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
1 parent 96bdcfc commit ef5caa0

21 files changed

+108
-27
lines changed

‎build.psm1

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

17611761
# Packaging tools
1762-
if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev" }
1762+
if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev", "rpm" }
17631763

17641764
# Install dependencies
17651765
# 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
@@ -934,7 +934,15 @@ function New-UnixPackage {
934934
try {
935935
if ($pscmdlet.ShouldProcess("Create $type package")) {
936936
Write-Log "Creating package with fpm..."
937-
$Output = Start-NativeExecution { fpm $Arguments }
937+
try {
938+
$Output = Start-NativeExecution { fpm $Arguments }
939+
}
940+
catch {
941+
Write-Verbose -Message "!!!Handling error in FPM!!!" -Verbose -ErrorAction SilentlyContinue
942+
Write-Verbose -Message "$Output" -Verbose -ErrorAction SilentlyContinue
943+
Get-Error -InputObject $_
944+
throw
945+
}
938946
}
939947
} finally {
940948
if ($Environment.IsMacOS) {
@@ -3782,7 +3790,7 @@ function Invoke-AzDevOpsLinuxPackageCreation {
37823790
}
37833791
}
37843792
catch {
3785-
Get-Error
3793+
Get-Error -InputObject $_
37863794
throw
37873795
}
37883796
}
@@ -3867,7 +3875,7 @@ function Invoke-AzDevOpsLinuxPackageBuild {
38673875
}
38683876
}
38693877
catch {
3870-
Get-Error
3878+
Get-Error -InputObject $_
38713879
throw
38723880
}
38733881
}

‎tools/releaseBuild/azureDevOps/releaseBuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ stages:
177177
pool:
178178
name: PowerShell1ES
179179
demands:
180-
- ImageOverride -equals MMS2019TLS
180+
- ImageOverride -equals PSMMS2019-Secure
181181
steps:
182182
- checkout: self
183183
clean: true

‎tools/releaseBuild/azureDevOps/releasePipeline.yml

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

146146
pool: PowerShell1ES
147147
demands:
148-
- ImageOverride -equals MMS2019TLS
148+
- ImageOverride -equals PSMMS2019-Secure
149149

150150
variables:
151151
- group: 'Staging_ACR'
@@ -161,7 +161,7 @@ stages:
161161

162162
pool: PowerShell1ES
163163
demands:
164-
- ImageOverride -equals MMS2019TLS
164+
- ImageOverride -equals PSMMS2019-Secure
165165

166166
variables:
167167
- group: 'Azure Blob variable group'
@@ -197,7 +197,7 @@ stages:
197197

198198
pool: PowerShell1ES
199199
demands:
200-
- ImageOverride -equals MMS2019TLS
200+
- ImageOverride -equals PSMMS2019-Secure
201201

202202
steps:
203203
- template: templates/release-ReleaseToNuGet.yml
@@ -206,7 +206,7 @@ stages:
206206

207207
pool: PowerShell1ES
208208
demands:
209-
- ImageOverride -equals MMSUbuntu20.04TLS
209+
- ImageOverride -equals PSMMSUbuntu20.04-Secure
210210

211211
variables:
212212
- group: 'AzDevOpsArtifacts'
@@ -280,7 +280,7 @@ stages:
280280

281281
pool: PowerShell1ES
282282
demands:
283-
- ImageOverride -equals MMS2019TLS
283+
- ImageOverride -equals PSMMS2019-Secure
284284

285285
variables:
286286
- 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
@@ -149,7 +149,7 @@ jobs:
149149
pool:
150150
name: PowerShell1ES
151151
demands:
152-
- ImageOverride -equals MMS2019TLS
152+
- ImageOverride -equals PSMMS2019-Secure
153153
variables:
154154
- name: buildName
155155
value: ${{ parameters.buildName }}

0 commit comments

Comments
 (0)
0