Merge pull request Homebrew#130382 from Homebrew/approval-check

carlocab · web-flow · commit 7d2bfef6b498 · 2023-05-30T12:21:16.000Z
workflows: improve approval check
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -96,6 +96,30 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR: ${{ steps.pr.outputs.number }}
+          QUERY: |-
+            query ($owner: String!, $name: String!, $pr: Int!) {
+              repository(owner: $owner, name: $name) {
+                pullRequest(number: $pr) {
+                  reviewDecision
+                  commits(last: 1) {
+                    nodes {
+                      commit {
+                        checkSuites(last: 100) {
+                          nodes {
+                            conclusion
+                            workflowRun {
+                              workflow {
+                                name
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
         run: |
           attempt=0
           max_attempts=5
@@ -105,41 +129,33 @@ jobs:
           do
             attempt=$(( attempt + 1 ))
 
-            approved=false
-            complete=false
-            mergeable=false
-
-            review_data="$(
-              gh api \
-                --header 'Accept: application/vnd.github+json' \
-                --header 'X-GitHub-Api-Version: 2022-11-28' \
-                "repos/$GH_REPO/pulls/$PR/reviews"
+            query_response="$(
+              gh api graphql \
+                --field owner='{owner}' \
+                --field name='{repo}' \
+                --field pr="$PR" \
+                --raw-field query="$QUERY" \
+                --jq '.data.repository.pullRequest'
             )"
-            if jq --exit-status 'any(.[].state; .== "APPROVED")' <<< "$review_data" &&
-               jq --exit-status 'all(.[].state; .!= "CHANGES_REQUESTED" )' <<< "$review_data"
-            then
-              approved=true
-            fi
-
-            if gh pr checks "$PR"
-            then
-              complete=true
-            fi
 
-            pr_data="$(
+            approved="$(
+              jq --raw-output '.reviewDecision == "APPROVED"' <<< "$query_response"
+            )"
+            complete="$(
+              jq --raw-output \
+                '.commits.nodes[].commit.checkSuites.nodes |
+                   map(select(.workflowRun.workflow.name == "CI")) |
+                     last | .conclusion == "SUCCESS"' <<< "$query_response"
+            )"
+            # See https://github.com/octokit/octokit.net/issues/1763 for possible `mergeable_state` values.
+            mergeable="$(
               gh api \
                 --header 'Accept: application/vnd.github+json' \
                 --header 'X-GitHub-Api-Version: 2022-11-28' \
-                "repos/$GH_REPO/pulls/$PR"
+                "repos/{owner}/{repo}/pulls/$PR" \
+                --jq '(.mergeable_state == "clean") and (.draft | not)'
             )"
 
-            # See https://github.com/octokit/octokit.net/issues/1763 for possible values.
-            if jq --exit-status '.mergeable_state == "clean"' <<< "$pr_data" &&
-               jq --exit-status '.draft | not' <<< "$pr_data"
-            then
-              mergeable=true
-            fi
-
             if [[ "$approved" = "true" ]] &&
                [[ "$complete" = "true" ]] &&
                [[ "$mergeable" = "true" ]] ||
