mirror of
https://github.com/PowerShell/PowerShell
synced 2026-06-08 12:12:50 +00:00
Rename alpine to linux-musl
This commit is contained in:
+4
-4
@@ -271,7 +271,7 @@ function Test-IsReleaseCandidate
|
||||
return $false
|
||||
}
|
||||
|
||||
$optimizedFddRegex = 'fxdependent-(linux|alpine|win|win7|osx)-(x64|x86|arm64|arm)'
|
||||
$optimizedFddRegex = 'fxdependent-(linux|linux-musl|win|win7|osx)-(x64|x86|arm64|arm)'
|
||||
|
||||
function Start-PSBuild {
|
||||
[CmdletBinding(DefaultParameterSetName="Default")]
|
||||
@@ -305,7 +305,7 @@ function Start-PSBuild {
|
||||
# These runtimes must match those in project.json
|
||||
# We do not use ValidateScript since we want tab completion
|
||||
# If this parameter is not provided it will get determined automatically.
|
||||
[ValidateSet("alpine-x64",
|
||||
[ValidateSet("linux-musl-x64",
|
||||
"fxdependent",
|
||||
"fxdependent-linux-x64",
|
||||
"fxdependent-linux-arm64",
|
||||
@@ -828,7 +828,7 @@ function New-PSOptions {
|
||||
# These are duplicated from Start-PSBuild
|
||||
# We do not use ValidateScript since we want tab completion
|
||||
[ValidateSet("",
|
||||
"alpine-x64",
|
||||
"linux-musl-x64",
|
||||
"fxdependent",
|
||||
"fxdependent-linux-x64",
|
||||
"fxdependent-linux-arm64",
|
||||
@@ -1219,7 +1219,7 @@ function Start-PSPester {
|
||||
# if we are building for Alpine, we must include the runtime as linux-x64
|
||||
# will not build runnable test tools
|
||||
if ( $environment.IsLinux -and $environment.IsAlpine ) {
|
||||
$publishArgs['runtime'] = 'alpine-x64'
|
||||
$publishArgs['runtime'] = 'linux-musl-x64'
|
||||
}
|
||||
Publish-PSTestTools @publishArgs | ForEach-Object {Write-Host $_}
|
||||
}
|
||||
|
||||
@@ -158,7 +158,7 @@ function Get-CGRegistrations {
|
||||
param(
|
||||
[Parameter(Mandatory)]
|
||||
[ValidateSet(
|
||||
"alpine-x64",
|
||||
"linux-musl-x64",
|
||||
"linux-arm",
|
||||
"linux-arm64",
|
||||
"linux-x64",
|
||||
@@ -264,7 +264,7 @@ function Get-CGRegistrations {
|
||||
$registrations = [System.Collections.Generic.Dictionary[string, Registration]]::new()
|
||||
$lastCount = 0
|
||||
$registrationChanged = $false
|
||||
foreach ($runtime in "win7-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win7-x86") {
|
||||
foreach ($runtime in "win7-x64", "linux-x64", "osx-x64", "linux-musl-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win7-x86") {
|
||||
$registrationChanged = (Get-CGRegistrations -Runtime $runtime -RegistrationTable $registrations) -or $registrationChanged
|
||||
$count = $registrations.Count
|
||||
$newCount = $count - $lastCount
|
||||
|
||||
@@ -90,7 +90,7 @@ function Start-PSPackage {
|
||||
} elseif ($MacOSRuntime) {
|
||||
$MacOSRuntime, "Release"
|
||||
} elseif ($Type.Count -eq 1 -and $Type[0] -eq "tar-alpine") {
|
||||
New-PSOptions -Configuration "Release" -Runtime "alpine-x64" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
|
||||
New-PSOptions -Configuration "Release" -Runtime "linux-musl-x64" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
|
||||
} elseif ($Type.Count -eq 1 -and $Type[0] -eq "tar-arm") {
|
||||
New-PSOptions -Configuration "Release" -Runtime "Linux-ARM" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
|
||||
} elseif ($Type.Count -eq 1 -and $Type[0] -eq "tar-arm64") {
|
||||
@@ -486,7 +486,7 @@ function Start-PSPackage {
|
||||
Name = $Name
|
||||
Version = $Version
|
||||
Force = $Force
|
||||
Architecture = "alpine-x64"
|
||||
Architecture = "musl-x64"
|
||||
ExcludeSymbolicLinks = $true
|
||||
}
|
||||
|
||||
@@ -4384,7 +4384,7 @@ function Invoke-AzDevOpsLinuxPackageBuild {
|
||||
$buildParams.Add("Runtime", "fxdependent")
|
||||
}
|
||||
'alpine' {
|
||||
$buildParams.Add("Runtime", 'alpine-x64')
|
||||
$buildParams.Add("Runtime", 'linux-musl-x64')
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ function BuildPackages {
|
||||
$buildParams.Add("Runtime", "fxdependent")
|
||||
} elseif ($Alpine.IsPresent) {
|
||||
$projectAssetsZipName = 'linuxAlpineProjectAssetssymbols.zip'
|
||||
$buildParams.Add("Runtime", 'alpine-x64')
|
||||
$buildParams.Add("Runtime", 'musl-x64')
|
||||
} else {
|
||||
# make the artifact name unique
|
||||
$projectAssetsZipName = "linuxProjectAssets-$((Get-Date).Ticks)-symbols.zip"
|
||||
|
||||
Reference in New Issue
Block a user