admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build after the change to remove win-arm32 (#20102)

Browse Source
This commit is contained in:
Aditya Patwardhan
2023-08-10 14:39:31 -07:00
committed by GitHub
parent 1f48d859d1
commit 0071602fb0
7 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/packaging/packaging.psm1
-1
View File
@@ -125,7 +125,6 @@ function Start-PSPackage {
# Runtime will be one of win7-x64, win7-x86, "win-arm" and "win-arm64" on Windows.
# Build the name suffix for universal win-plat packages.
switch ($Runtime) {
"win-arm" { $NameSuffix = "win-arm32" }
"win-arm64" { $NameSuffix = "win-arm64" }
default { $NameSuffix = $_ -replace 'win\d+', 'win' }
}
tools/releaseBuild/azureDevOps/templates/global-tool-pkg-sbom.yml
-1
View File
@@ -14,7 +14,6 @@ parameters:
- PowerShell.Linux.arm32
- PowerShell.Linux.arm64
- PowerShell.Windows.x64
- PowerShell.Windows.arm32
steps:
tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
+1 -1
View File
@@ -70,7 +70,7 @@ steps:
- pwsh: |
$message = @()
Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -include *.zip, *.msi | ForEach-Object {
if($_.Name -notmatch 'PowerShell-\d+\.\d+\.\d+\-([a-z]*.\d+\-)?win\-(fxdependent|x64|arm32|arm64|x86|fxdependentWinDesktop)\.(msi|zip){1}')
if($_.Name -notmatch 'PowerShell-\d+\.\d+\.\d+\-([a-z]*.\d+\-)?win\-(fxdependent|x64|arm64|x86|fxdependentWinDesktop)\.(msi|zip){1}')
{
$messageInstance = "$($_.Name) is not a valid package name"
$message += $messageInstance
tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+1 -1
View File
@@ -55,7 +55,7 @@ jobs:
- pwsh: |
$message = @()
Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -include *.zip, *.msi | ForEach-Object {
if($_.Name -notmatch 'PowerShell-\d+\.\d+\.\d+\-([a-z]*.\d+\-)?win\-(fxdependent|x64|arm32|arm64|x86|fxdependentWinDesktop)\.(msi|zip){1}')
if($_.Name -notmatch 'PowerShell-\d+\.\d+\.\d+\-([a-z]*.\d+\-)?win\-(fxdependent|x64|arm64|x86|fxdependentWinDesktop)\.(msi|zip){1}')
{
$messageInstance = "$($_.Name) is not a valid package name"
$message += $messageInstance
tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
-1
View File
@@ -53,7 +53,6 @@ jobs:
{
"x64" { "win7-x64" }
"x86" { "win7-x86" }
"arm" { "win-arm"}
"arm64" { "win-arm64" }
"fxdependent" { "fxdependent" }
"fxdependentWinDesktop" { "fxdependent-win-desktop" }
tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
-6
View File
@@ -95,12 +95,6 @@ jobs:
version: $(version)
pdb: yes
- template: upload.yml
parameters:
architecture: arm32
version: $(version)
msi: no
- template: upload.yml
parameters:
architecture: arm64
tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+1 -2
View File
@@ -43,7 +43,7 @@ jobs:
- template: shouldSign.yml
- pwsh: |
$pkgFilter = if ( '$(Architecture)' -eq 'arm' ) { "arm32" } else { '$(Architecture)' }
$pkgFilter = '$(Architecture)'
if ($env:BuildConfiguration -eq 'minSize') { $pkgFilter += '-gc' }
$vstsCommandString = "vso[task.setvariable variable=PkgFilter]$pkgFilter"
@@ -243,7 +243,6 @@ jobs:
{
"x64" { "win7-x64" }
"x86" { "win7-x86" }
"arm" { "win-arm"}
"arm64" { "win-arm64" }
"fxdependent" { "fxdependent" }
"fxdependentWinDesktop" { "fxdependent-win-desktop" }