mirror of
https://github.com/PowerShell/PowerShell
synced 2026-06-08 12:12:50 +00:00
[release/v7.4] Update the macos package name for preview releases to match the previous pattern (#26435)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -82,7 +82,7 @@ jobs:
|
||||
- pwsh: |
|
||||
$message = @()
|
||||
Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.pkg | ForEach-Object {
|
||||
if($_.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?osx(\.10\.12)?\-(x64|arm64)\.pkg')
|
||||
if($_.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?osx\-(x64|arm64)\.pkg')
|
||||
{
|
||||
$messageInstance = "$($_.Name) is not a valid package name"
|
||||
$message += $messageInstance
|
||||
|
||||
@@ -82,12 +82,13 @@ Describe "Verify macOS Package" {
|
||||
$script:package | Should -Not -BeNullOrEmpty
|
||||
|
||||
# Regex pattern for valid macOS PKG package names.
|
||||
# This pattern matches the validation used in release-validate-packagenames.yml
|
||||
# Valid examples:
|
||||
# - powershell-7.4.13-osx-x64.pkg (Intel x64 - note: x64 with hyphens for compatibility)
|
||||
# - powershell-7.4.13-osx-arm64.pkg (Apple Silicon)
|
||||
# - powershell-preview-7.6.0-preview.6-osx-x64.pkg
|
||||
# - powershell-lts-7.4.13-osx-arm64.pkg
|
||||
$pkgPackageNamePattern = '^powershell(-preview|-lts)?-\d+\.\d+\.\d+(-[a-z]+\.\d+)?-osx-(x64|arm64)\.pkg$'
|
||||
# - powershell-7.4.13-osx-x64.pkg (Stable release)
|
||||
# - powershell-7.6.0-preview.6-osx-x64.pkg (Preview version string)
|
||||
# - powershell-7.4.13-rebuild.5-osx-arm64.pkg (Rebuild version)
|
||||
# - powershell-lts-7.4.13-osx-arm64.pkg (LTS package)
|
||||
$pkgPackageNamePattern = '^powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?osx\-(x64|arm64)\.pkg$'
|
||||
|
||||
$script:package.Name | Should -Match $pkgPackageNamePattern -Because "Package name should follow the standard naming convention"
|
||||
}
|
||||
|
||||
@@ -1145,15 +1145,12 @@ function New-UnixPackage {
|
||||
}
|
||||
|
||||
# Determine if the version is a preview version
|
||||
$IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS
|
||||
|
||||
# Preview versions have preview in the name
|
||||
# Only LTS packages get a prefix in the name
|
||||
# Preview versions are identified by the version string itself (e.g., 7.6.0-preview.6)
|
||||
# Rebuild versions are also identified by the version string (e.g., 7.4.13-rebuild.5)
|
||||
$Name = if($LTS) {
|
||||
"powershell-lts"
|
||||
}
|
||||
elseif ($IsPreview) {
|
||||
"powershell-preview"
|
||||
}
|
||||
else {
|
||||
"powershell"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user