Skip to content

Commit 6af8d7a

Browse files
authored
ignore bots, improve enums, fix perm check
1 parent 4151998 commit 6af8d7a

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/Shared-AutoLabelAssign.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,7 @@ jobs:
11501150

11511151
###################################### Auto reviewer assignment ######################################
11521152

1153-
If ($AutoAssignReviewers -eq $True) {
1153+
If (($AutoAssignReviewers -eq $True) -and ($PrCreator -notlike "*\[bot\]*")) {
11541154

11551155
# There's a short window between PR open and when Draft is set by the TierManagement workflow where PR reviewers could be added.
11561156
# This If statement prevents that from happening.
@@ -1161,7 +1161,7 @@ jobs:
11611161
$UserPermission = $(Invoke-RestMethod -Method GET -Headers $GitHubHeaders -Uri $UserPermissionUrl).role_name
11621162

11631163
# Only add reviewers if the submitter can't sign off on their own PR.
1164-
If ($UserPermission -eq "read") {
1164+
If (($UserPermission -eq "read") -or ($UserPermission -eq "") -or ($UserPermission -eq $Null)) {
11651165

11661166
# Get the service/subservice to GitHub account map
11671167
$ServiceToAccountMap = Get-ServiceGitHubAccountMappingTable
@@ -1233,7 +1233,7 @@ jobs:
12331233

12341234
Write-Host "No additional reviewers to add. Not setting reviewers or posting PR comment."
12351235

1236-
$LoggingData.ReviewStatus = "ReviewerAddSkipped"
1236+
$LoggingData.ReviewStatus = "NoAdditionalReviewers"
12371237
$LoggingData.ReviewDetails = "No additional reviewers to add."
12381238

12391239
}
@@ -1243,7 +1243,7 @@ jobs:
12431243
Write-Host "No valid reviewers to assign."
12441244
Write-Host $TestedReviewerAccounts
12451245

1246-
$LoggingData.ReviewStatus = "ReviewerAddSkipped"
1246+
$LoggingData.ReviewStatus = "NoValidReviewers"
12471247
$LoggingData.ReviewDetails = "No valid reviewers to assign."
12481248

12491249
}
@@ -1252,7 +1252,7 @@ jobs:
12521252

12531253
Write-Host "No reviewers matched any services or subservices in PR articles."
12541254

1255-
$LoggingData.ReviewStatus = "ReviewerAddSkipped"
1255+
$LoggingData.ReviewStatus = "NoMatchedSvcSubSvc"
12561256
$LoggingData.ReviewDetails = "No reviewers matched any services or subservices."
12571257

12581258

@@ -1263,7 +1263,7 @@ jobs:
12631263

12641264
Write-Host "Not adding reviewer because submitter can sign off PR. User permission: $UserPermission."
12651265

1266-
$LoggingData.ReviewStatus = "ReviewerAddSkipped"
1266+
$LoggingData.ReviewStatus = "NotReadOnly"
12671267
$LoggingData.ReviewDetails = "Not adding reviewer because submitter can sign off PR. User permission: $UserPermission."
12681268

12691269
}
@@ -1272,8 +1272,8 @@ jobs:
12721272

12731273
Write-Host "Not adding PR reviewers. PR action: $GitHubAction. Draft state: $IsPrDraft."
12741274

1275-
$LoggingData.ReviewStatus = "ReviewerAddSkipped"
1276-
$LoggingData.ReviewDetails = "Not adding reviewers because PR is draft."
1275+
$LoggingData.ReviewStatus = "PrDraftOrOpened"
1276+
$LoggingData.ReviewDetails = "Not adding reviewers because PR is draft or just opened."
12771277

12781278
}
12791279

@@ -1285,7 +1285,7 @@ jobs:
12851285

12861286
} Else {
12871287

1288-
Write-Host "Auto reviewer assignment disabled."
1288+
Write-Host "Auto reviewer assignment disabled or PR creator is bot account. Assignment enabled: $AutoAssignReviewers. PR creator: $PrCreator."
12891289

12901290
}
12911291

0 commit comments

Comments
 (0)