From 6fcc74dd2901f8cbcfb3114c2c6cef4d461ef944 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Mon, 12 Apr 2021 15:23:23 -0700 Subject: [PATCH 1/2] Fix Package validation Regex --- .../azureDevOps/templates/release-ValidatePackageNames.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml index d0276ab11fe..5ff536c6e5c 100644 --- a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml +++ b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml @@ -24,7 +24,7 @@ steps: - pwsh: | $message = @() Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.rpm | ForEach-Object { - if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d\.\d\.\d(_[a-z]*\.\d+)?-1.(rhel|centos).\d+\.x86_64\.rpm') + if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d\.\d\.\d(_[a-z]*\.\d+)?-1.(rh|rhel|centos)(.\d+)?\.x86_64\.rpm') { $messageInstance = "$($_.Name) is not a valid package name" $message += $messageInstance @@ -77,7 +77,7 @@ steps: - pwsh: | $message = @() Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.deb | ForEach-Object { - if($_.Name -notmatch 'powershell(-preview|-lts)?_\d\.\d\.\d([\-~][a-z]*.\d+)?-\d\.(debian|ubuntu){1}\.\d+(\.\d+)?_amd64\.deb') + if($_.Name -notmatch 'powershell(-preview|-lts)?_\d\.\d\.\d([\-~][a-z]*.\d+)?-\d\.(deb|debian|ubuntu){1}(\.\d+)?(\.\d+)?_amd64\.deb') { $messageInstance = "$($_.Name) is not a valid package name" $message += $messageInstance From 7194e1e418ce7e36a2b527635ccdddf1e3c53cfd Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Mon, 12 Apr 2021 15:46:09 -0700 Subject: [PATCH 2/2] remove old patterns --- .../azureDevOps/templates/release-ValidatePackageNames.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml index 5ff536c6e5c..22cf8778ed1 100644 --- a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml +++ b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml @@ -24,7 +24,7 @@ steps: - pwsh: | $message = @() Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.rpm | ForEach-Object { - if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d\.\d\.\d(_[a-z]*\.\d+)?-1.(rh|rhel|centos)(.\d+)?\.x86_64\.rpm') + if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d\.\d\.\d(_[a-z]*\.\d+)?-1.rh.x86_64\.rpm') { $messageInstance = "$($_.Name) is not a valid package name" $message += $messageInstance @@ -77,7 +77,7 @@ steps: - pwsh: | $message = @() Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.deb | ForEach-Object { - if($_.Name -notmatch 'powershell(-preview|-lts)?_\d\.\d\.\d([\-~][a-z]*.\d+)?-\d\.(deb|debian|ubuntu){1}(\.\d+)?(\.\d+)?_amd64\.deb') + if($_.Name -notmatch 'powershell(-preview|-lts)?_\d\.\d\.\d([\-~][a-z]*.\d+)?-\d\.deb_amd64\.deb') { $messageInstance = "$($_.Name) is not a valid package name" $message += $messageInstance