Skip to content

Commit 5d7b8b9

Browse files
author
Andrew
authored
Fixed package names verification to support multi-digit versions (PowerShell#17220)
Fixed package names verification to support multi-digit versions. Currently "Validate RPM package names" release step is failing because of version "7.0.10" in these examples: WARNING: powershell-7.0.10-1.centos.8.x86_64.rpm is not a valid package name WARNING: powershell-7.0.10-1.rhel.7.x86_64.rpm is not a valid package name WARNING: powershell-lts-7.0.10-1.centos.8.x86_64.rpm is not a valid package name WARNING: powershell-lts-7.0.10-1.rhel.7.x86_64.rpm is not a valid package name
1 parent 669d15b commit 5d7b8b9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ steps:
3030
- pwsh: |
3131
$message = @()
3232
Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.rpm | ForEach-Object {
33-
if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d\.\d\.\d(_[a-z]*\.\d+)?-1.(rh|cm1).x86_64\.rpm')
33+
if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d+\.\d+\.\d+(_[a-z]*\.\d+)?-1.(rh|cm1).x86_64\.rpm')
3434
{
3535
$messageInstance = "$($_.Name) is not a valid package name"
3636
$message += $messageInstance
@@ -43,7 +43,7 @@ steps:
4343
- pwsh: |
4444
$message = @()
4545
Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.tar.gz | ForEach-Object {
46-
if($_.Name -notmatch 'powershell-(lts-)?\d\.\d\.\d\-([a-z]*.\d+\-)?(linux|osx|linux-alpine)+\-(x64\-fxdependent|x64|arm32|arm64)\.(tar\.gz)')
46+
if($_.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?(linux|osx|linux-alpine)+\-(x64\-fxdependent|x64|arm32|arm64)\.(tar\.gz)')
4747
{
4848
$messageInstance = "$($_.Name) is not a valid package name"
4949
$message += $messageInstance
@@ -56,7 +56,7 @@ steps:
5656
- pwsh: |
5757
$message = @()
5858
Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.pkg | ForEach-Object {
59-
if($_.Name -notmatch 'powershell-(lts-)?\d\.\d\.\d\-([a-z]*.\d+\-)?osx(\.10\.12)?\-(x64|arm64)\.pkg')
59+
if($_.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?osx(\.10\.12)?\-(x64|arm64)\.pkg')
6060
{
6161
$messageInstance = "$($_.Name) is not a valid package name"
6262
$message += $messageInstance
@@ -69,7 +69,7 @@ steps:
6969
- pwsh: |
7070
$message = @()
7171
Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -include *.zip, *.msi | ForEach-Object {
72-
if($_.Name -notmatch 'PowerShell-\d\.\d\.\d\-([a-z]*.\d+\-)?win\-(fxdependent|x64|arm32|arm64|x86|fxdependentWinDesktop)\.(msi|zip){1}')
72+
if($_.Name -notmatch 'PowerShell-\d+\.\d+\.\d+\-([a-z]*.\d+\-)?win\-(fxdependent|x64|arm32|arm64|x86|fxdependentWinDesktop)\.(msi|zip){1}')
7373
{
7474
$messageInstance = "$($_.Name) is not a valid package name"
7575
$message += $messageInstance
@@ -83,7 +83,7 @@ steps:
8383
- pwsh: |
8484
$message = @()
8585
Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.deb | ForEach-Object {
86-
if($_.Name -notmatch 'powershell(-preview|-lts)?_\d\.\d\.\d([\-~][a-z]*.\d+)?-\d\.deb_amd64\.deb')
86+
if($_.Name -notmatch 'powershell(-preview|-lts)?_\d+\.\d+\.\d+([\-~][a-z]*.\d+)?-\d\.deb_amd64\.deb')
8787
{
8888
$messageInstance = "$($_.Name) is not a valid package name"
8989
$message += $messageInstance

0 commit comments

Comments
 (0)