Merge branch 'main' into optimise-fortran-linting

Author: yaswant

.github/workflows/check-cr-approved.yaml

@@ -6,15 +6,15 @@ on:
 permissions: read-all
 
 jobs:
-  check_approved:
+  cr_check:
     runs-on: ubuntu-24.04
     timeout-minutes: 2
 
     steps:
       - name: Check for Code Reviewer approval
         env:
           PR_BODY: ${{ github.event.pull_request.body }}
-          PR_NUMBER: ${{ github.event.number }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
           REPO: ${{ github.repository }}
           GH_TOKEN: ${{ github.token }}
         run: |
@@ -29,20 +29,18 @@ jobs:
           echo "Expected Code Reviewer: $CODE_REVIEWER"
 
           # -- 2. Check the review status
-          CR_APPROVED=$(gh pr view -R "$REPO" "$PR_NUMBER" --json "reviews" |
-            jq -r --arg cr "$CODE_REVIEWER" ' .reviews[] |
-            select((.author.login == $cr) and .state == "APPROVED") |
-            .state')
+          reviews=$(gh pr view -R "$REPO" "$PR_NUMBER" --json "reviews" | jq -r --arg cr "$CODE_REVIEWER" '
+                    [ .reviews[] | select(.author.login == $cr) ]')
 
-          if [[ "$CR_APPROVED" == "APPROVED" ]]; then
+          # Check if any review is APPROVED
+          approved=$(echo "$reviews" | jq -r '[ .[] | select(.state == "APPROVED") ] | length')
+
+          if [[ "$approved" -gt 0 ]]; then
             echo "✅ Success: The listed Code Reviewer ($CODE_REVIEWER) has approved this PR."
           else
-            # Exit with failure if the specific reviewer has not yet approved
             echo "::error::The listed Code Reviewer ($CODE_REVIEWER) has not yet approved this PR."
             echo "Current reviews for this user:"
-            gh pr view -R "$REPO" "$PR_NUMBER" --json "reviews" | jq -r --arg cr "$CODE_REVIEWER" '
-              .reviews[] | select(.author.login == $cr) | "- \(.state)"'
-
+            echo "$reviews" | jq -r '.[] | "- \(.state)"'
             echo "::notice::This action may be bypassed by a reviewer with sufficient permissions if appropriate."
             exit 1
           fi