Fix regex applying PR logic to versioned release branches.

VstsPullRequestApprover/VstsPullRequestApprover.Tests.ps1

@@ -78,4 +78,42 @@ Describe "Get-VstsApiBaseUri" {
     }
 }
 
+Describe "Get-PullRequestId" {
+    InModuleScope VstsPullRequestApprover {
+        Context "When called with a valid pull request branch" {
+            $id = Get-PullRequestId "refs/pull/861/merge"
+
+            It "Should return the id" {
+                $id | Should Be "861"
+            }
+        }
+
+        Context "When called with a versioned branch" {
+            $id = Get-PullRequestId "refs/head/release/1.0.0"
+
+            It "Should return null" {
+                $id | Should Be $null
+            }
+        }
+
+        Context "When called with a unversioned branch" {
+            $id = Get-PullRequestId "refs/head/develop"
+
+            It "Should return null" {
+                $id | Should Be $null
+            }
+        }
+
+
+        Context "When called with a feature branch" {
+            $id = Get-PullRequestId "refs/head/feature/12321-new-feature"
+
+            It "Should return null" {
+                $id | Should Be $null
+            }
+        }
+    }
+}
+
+
 Remove-Module VstsPullRequestApprover

VstsPullRequestApprover/VstsPullRequestApprover.psm1

@@ -91,13 +91,23 @@ function Get-VstsApiBaseUri
     return "https://$($variables.Instance)/$($variables.TeamProject)/_apis/git/repositories/$($variables.Repository)"
 }
 
+function Get-PullRequestId
+{
+    param($branch)
+
+    return $branch | select-string -Pattern "refs/pull/(?<id>[0-9]+)/merge" `
+                   | Select-Object -ExpandProperty Matches `
+                   | ForEach-Object { $_.Groups["id"].Value } `
+                   | Select-Object -First 1
+}
+
 function Set-PullRequestStatus
 {
     param($vcsroot, $branch, $accessToken, $reviewerAccount, [bool]$approve, $buildUri)
 
     Write-Host "**** Setting build status for pull request ****"
 
-    $pullRequest = ($branch | select-string -Pattern "([0-9]+)").Matches.Value
+    $pullRequest = Get-PullRequestId $branch
 
     if(!$pullRequest)
     {