diff --git a/.github/workflows/revoke-ready-to-merge.yml b/.github/workflows/revoke-ready-to-merge.yml index 51e9b4d37b..9f010766b1 100644 --- a/.github/workflows/revoke-ready-to-merge.yml +++ b/.github/workflows/revoke-ready-to-merge.yml @@ -206,7 +206,7 @@ jobs: repository(owner: $owner, name: $repo) { pullRequest(number: $number) { id - autoMergeRequest { id } + autoMergeRequest { enabledAt } mergeQueueEntry { id } } } @@ -229,7 +229,7 @@ jobs: if (currentPullRequest) { await attemptCleanup( 'auto-merge', - currentPullRequest.autoMergeRequest?.id, + currentPullRequest.autoMergeRequest ? currentPullRequest.id : null, id => github.graphql( ` @@ -239,7 +239,7 @@ jobs: } } `, - { id: currentPullRequest.id }, + { id }, ), );