From 0792dfcceb0ff882498428eeaa3af4fc5fa17cf9 Mon Sep 17 00:00:00 2001
From: "privilegedescalation-ceo[bot]"
 <269721483+privilegedescalation-ceo[bot]@users.noreply.github.com>
Date: Wed, 15 Apr 2026 03:00:38 +0000
Subject: [PATCH] fix(release): use mergeStateStatus instead of deprecated
 mergeableState (#99)

gh CLI no longer supports --json mergeableState; the field is now
mergeStateStatus with uppercase enum values (BLOCKED, UNKNOWN, etc.)

Co-authored-by: privilegedescalation-ceo[bot] <269721483+privilegedescalation-ceo[bot]@users.noreply.github.com>
---
 .github/workflows/plugin-release.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/plugin-release.yaml b/.github/workflows/plugin-release.yaml
index 86934e1..8db65da 100644
--- a/.github/workflows/plugin-release.yaml
+++ b/.github/workflows/plugin-release.yaml
@@ -298,19 +298,19 @@ jobs:
             exit 0
           fi
           # Use auto-merge only when there are pending status checks to wait for.
-          # Valid mergeableState values from GitHub REST API:
-          # behind, blocked, clean, dirty, draft, has_hooks, unknown, unstable
-          # Note: "pending" is NOT a valid mergeable_state value — it was dead code.
-          MERGE_STATE=$(gh pr view "release/v${VERSION}" --json mergeableState --jq '.mergeableState')
-          if [ "$MERGE_STATE" = "blocked" ]; then
+          # Valid mergeStateStatus values (gh GraphQL):
+          # BEHIND, BLOCKED, CLEAN, DIRTY, DRAFT, HAS_HOOKS, UNKNOWN, UNSTABLE
+          # Note: Field was renamed from mergeableState to mergeStateStatus in gh CLI.
+          MERGE_STATE=$(gh pr view "release/v${VERSION}" --json mergeStateStatus --jq '.mergeStateStatus')
+          if [ "$MERGE_STATE" = "BLOCKED" ]; then
             echo "PR is $MERGE_STATE — enabling auto-merge."
             gh pr merge "release/v${VERSION}" --auto --squash --delete-branch
-          elif [ "$MERGE_STATE" = "unknown" ]; then
+          elif [ "$MERGE_STATE" = "UNKNOWN" ]; then
             # GitHub is still computing mergeability. Retry once after a brief wait.
             echo "PR is $MERGE_STATE — GitHub is computing mergeability. Retrying in 5s."
             sleep 5
-            MERGE_STATE=$(gh pr view "release/v${VERSION}" --json mergeableState --jq '.mergeableState')
-            if [ "$MERGE_STATE" = "blocked" ]; then
+            MERGE_STATE=$(gh pr view "release/v${VERSION}" --json mergeStateStatus --jq '.mergeStateStatus')
+            if [ "$MERGE_STATE" = "BLOCKED" ]; then
               echo "PR is now $MERGE_STATE — enabling auto-merge."
               gh pr merge "release/v${VERSION}" --auto --squash --delete-branch
             else