Merge pull request #886 from DEFRA/fix/merge-gh-action

FSR-0000 | Fix/merge gh action
DEFRA · Nov 19, 2024 · 270c4f4 · 270c4f4
2 parents c0eedc7 + ae9b703
commit 270c4f4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -54,7 +54,7 @@ jobs:
             function prCheck () {
               REPO=$1
               BASE=$2
-              STATE=$(gh pr list --repo $GITHUB_REPOSITORY_OWNER/$REPO --json title,mergeStateStatus,state,reviews --state OPEN --base $BASE --head $RELEASE_BRANCH --jq '.[] | select(.mergeStateStatus == "CLEAN" and .reviews[].state == "APPROVED") | .reviews[].state ')
+              STATE=$(gh pr list --repo $GITHUB_REPOSITORY_OWNER/$REPO --json title,mergeStateStatus,state,reviews --state OPEN --base $BASE --head $RELEASE_BRANCH --jq '.[] | select(.mergeStateStatus == "CLEAN" and .reviews[].state == "APPROVED") | .reviews[-1].state ')
               if [ "$STATE" != "APPROVED" ]; then
                 echo "Error: PR for merging $GITHUB_REPOSITORY_OWNER/$REPO $RELEASE_BRANCH into $BASE needs to be ready to merge and approved. (STATE=$STATE)" >&2
                 exit 1