8000 Fix alpine tar package name and do not crossgen alpine fxdependent package by adityapatwardhan · Pull Request #20459 · PowerShell/PowerShell · GitHub
[go: up one dir, main page]
Skip to content

Fix alpine tar package name and do not crossgen alpine fxdependent package #20459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 9, 2023
Merged

Fix alpine tar package name and do not crossgen alpine fxdependent package #20459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34ded6e
Fix alpine packaging and crossgen for fxd pacakge
adityapatwardhan Oct 3, 2023
30faf17
Use correct SDK
adityapatwardhan Oct 5, 2023
ff0f259
Fix tar package name and alpine fxd download
adityapatwardhan Oct 5, 2023
61e4cd0
Add noopt to package name
adityapatwardhan Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.psm1
View file
Open in desktop
8000
Original file line numberDiff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ function Test-IsReleaseCandidate
return $false
}

$optimizedFddRegex = 'fxdependent-(linux|linux-musl|win|win7|osx)-(x64|x86|arm64|arm)'
$optimizedFddRegex = 'fxdependent-(linux|win|win7|osx)-(x64|x86|arm64|arm)'

function Start-PSBuild {
[CmdletBinding(DefaultParameterSetName="Default")]
Expand Down Expand Up @@ -309,7 +309,7 @@ function Start-PSBuild {
# If this parameter is not provided it will get determined automatically.
[ValidateSet("linux-musl-x64",
"fxdependent",
"fxdependent-linux-musl-x64",
"fxdependent-noopt-linux-musl-x64",
"fxdependent-linux-x64",
"fxdependent-linux-arm64",
"fxdependent-win-desktop",
Expand Down Expand Up @@ -563,7 +563,7 @@ Fix steps:
Write-Verbose "Building with shim" -Verbose
$globalToolSrcFolder = Resolve-Path (Join-Path $Options.Top "../Microsoft.PowerShell.GlobalTool.Shim") | Select-Object -ExpandProperty Path

if ($Options.Runtime -eq 'fxdependent') {
if ($Options.Runtime -eq 'fxdependent' -or $Options.Runtime -eq 'fxdependent-noopt-linux-musl-x64') {
$Arguments += "/property:SDKToUse=Microsoft.NET.Sdk"
} elseif ($Options.Runtime -eq 'fxdependent-win-desktop') {
$Arguments += "/property:SDKToUse=Microsoft.NET.Sdk.WindowsDesktop"
Expand Down Expand Up @@ -900,7 +900,7 @@ function New-PSOptions {
[ValidateSet("",
"linux-musl-x64",
"fxdependent",
"fxdependent-linux-musl-x64",
"fxdependent-noopt-linux-musl-x64",
"fxdependent-linux-x64",
"fxdependent-linux-arm64",
"fxdependent-win-desktop",
Expand Down
10 changes: 5 additions & 5 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -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"
}
}
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0