Merge pull request #55 from github/changes-requested

PRs in the `CHANGES_REQUESTED` state need to be treated as "not approved"
github · Dec 12, 2024 · 8aa56c8 · 8aa56c8
2 parents 229efbe + af409b5
commit 8aa56c8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/functions/prechecks.js b/src/functions/prechecks.js
@@ -245,7 +245,8 @@ export async function prechecks(
     // CI checks are set to be bypassed and the PR has not been reviewed
   } else if (
     commitStatus === 'skip_ci' &&
-    reviewDecision === 'REVIEW_REQUIRED'
+    (reviewDecision === 'REVIEW_REQUIRED' ||
+      reviewDecision === 'CHANGES_REQUESTED')
   ) {
     message = `### ⚠️ Cannot proceed with operation\n\n> CI checks are not required for this operation but the PR has not been reviewed`
     return {message: message, status: false}
@@ -257,7 +258,8 @@ export async function prechecks(
 
     // If CI is passing but the PR has not been reviewed
   } else if (
-    reviewDecision === 'REVIEW_REQUIRED' &&
+    (reviewDecision === 'REVIEW_REQUIRED' ||
+      reviewDecision === 'CHANGES_REQUESTED') &&
     commitStatus === 'SUCCESS'
   ) {
     message = `### ⚠️ Cannot proceed with operation\n\n> CI checks are passing but the PR has not been reviewed`
@@ -270,7 +272,8 @@ export async function prechecks(
 
     // If CI is pending and the PR has not been reviewed
   } else if (
-    reviewDecision === 'REVIEW_REQUIRED' &&
+    (reviewDecision === 'REVIEW_REQUIRED' ||
+      reviewDecision === 'CHANGES_REQUESTED') &&
     commitStatus === 'PENDING'
   ) {
     message = `### ⚠️ Cannot proceed with operation\n\n- reviewDecision: \`${reviewDecision}\`\n- commitStatus: \`${commitStatus}\`\n\n> CI is still in a pending state and reviews are also required for this operation`
@@ -282,7 +285,11 @@ export async function prechecks(
     return {message: message, status: false}
 
     // If CI is undefined and the PR has not been reviewed
-  } else if (reviewDecision === 'REVIEW_REQUIRED' && commitStatus === null) {
+  } else if (
+    (reviewDecision === 'REVIEW_REQUIRED' ||
+      reviewDecision === 'CHANGES_REQUESTED') &&
+    commitStatus === null
+  ) {
     message = `### ⚠️ Cannot proceed with operation\n\n- reviewDecision: \`${reviewDecision}\`\n- commitStatus: \`${commitStatus}\`\n\n> CI checks have not been defined but reviews are required for this operation`
     return {message: message, status: false}