From 81eefc2c7acaaa5e6a56d682238d24cd534a91cc Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Thu, 12 Dec 2024 13:03:18 -0500 Subject: [PATCH] chore: use gh cli for automerge instead of action --- .github/workflows/sync-23-next.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sync-23-next.yml b/.github/workflows/sync-23-next.yml index ccd8ec2126..566edbbb0d 100644 --- a/.github/workflows/sync-23-next.yml +++ b/.github/workflows/sync-23-next.yml @@ -24,7 +24,6 @@ jobs: FROM_BRANCH: release-23.x TO_BRANCH: next - name: Enable Pull Request Automerge - uses: peter-evans/enable-pull-request-automerge@v2 - with: - token: ${{ secrets.requirements_bot_github_token }} - pull-request-number: ${{ steps.cpr.outputs.PULL_REQUEST_NUMBER }} + run: gh pr merge --merge --auto "${{ steps.cpr.outputs.PULL_REQUEST_NUMBER }}" + env: + GH_TOKEN: ${{ secrets.requirements_bot_github_token }}