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 alpine tar package name and do not crossgen alpine fxdependent package (#20459)

Browse Source
This commit is contained in:
Aditya Patwardhan
2023-10-09 14:54:38 -07:00
committed by GitHub
parent 3791f17d9c
commit a24e954069
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/packaging/packaging.psm1
+5 -5
View File
@@ -115,7 +115,7 @@ function Start-PSPackage {
New-PSOptions -Configuration "Release" -Runtime 'fxdependent-linux-arm64' -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
}
elseif ($Type.Count -eq 1 -and $Type[0] -eq "tar-alpine-fxdependent") {
New-PSOptions -Configuration "Release" -Runtime 'fxdependent-linux-musl-x64' -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
New-PSOptions -Configuration "Release" -Runtime 'fxdependent-noopt-linux-musl-x64' -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
}
else {
New-PSOptions -Configuration "Release" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
@@ -456,11 +456,11 @@ function Start-PSPackage {
$Arguments = @{
PackageSourcePath = $Source
Name = $Name
PackageNameSuffix = 'alpine-fxdependent'
PackageNameSuffix = 'musl-noopt-fxdependent'
Version = $Version
Force = $Force
R2RVerification = [R2RVerification]@{
R2RState = 'R2R'
R2RState = 'NoR2R'
OperatingSystem = "Linux"
}
}
@@ -594,7 +594,7 @@ function Start-PSPackage {
Name = $Name
Version = $Version
Force = $Force
Architecture = "linux-musl-x64"
Architecture = "musl-x64"
ExcludeSymbolicLinks = $true
R2RVerification = [R2RVerification]@{
R2RState = 'R2R'
@@ -4606,7 +4606,7 @@ function Invoke-AzDevOpsLinuxPackageBuild {
Remove-Item -Path $binDir -Recurse -Force
}
$buildParams['Runtime'] = 'fxdependent-linux-musl-x64'
$buildParams['Runtime'] = 'fxdependent-noopt-linux-musl-x64'
$buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${amd64AlpineFxdBuildFolder}"
Start-PSBuild -Clean @buildParams @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
# Remove symbol files, xml document files.
tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1
+1 -1
View File
@@ -59,7 +59,7 @@ function BuildPackages {
$buildParams.Add("Runtime", "fxdependent")
} elseif ($Alpine.IsPresent) {
$projectAssetsZipName = 'linuxAlpineProjectAssetssymbols.zip'
$buildParams.Add("Runtime", 'linux-musl-x64')
$buildParams.Add("Runtime", 'musl-x64')
} else {
# make the artifact name unique
$projectAssetsZipName = "linuxProjectAssets-$((Get-Date).Ticks)-symbols.zip"
tools/releaseBuild/azureDevOps/templates/nuget.yml
+1 -1
View File
@@ -111,7 +111,7 @@ jobs:
- task: ExtractFiles@1
displayName: 'Extract files alpine-fxdependent'
inputs:
archiveFilePatterns: '$(System.ArtifactsDirectory)/packages/powershell-*-linux-x64-alpine-fxdependent.tar.gz'
archiveFilePatterns: '$(System.ArtifactsDirectory)/packages/powershell-*-linux-x64-musl-noopt-fxdependent.tar.gz'
destinationFolder: '$(alpineFxdPath)'
- template: SetVersionVariables.yml
tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
+1 -1
View File
@@ -44,7 +44,7 @@ steps:
- pwsh: |
$message = @()
Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.tar.gz | ForEach-Object {
if($_.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?(linux|osx|linux-linux-musl)+\-(x64\-fxdependent|x64|arm32|arm64|x64\-alpine\-fxdependent)\.(tar\.gz)')
if($_.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?(linux|osx|linux-musl)+\-(x64\-fxdependent|x64|arm32|arm64|x64\-musl\-fxdependent)\.(tar\.gz)')
{
$messageInstance = "$($_.Name) is not a valid package name"
$message += $messageInstance