From b2aa33d79a87cf5f8b234ffc70723bff994a440c Mon Sep 17 00:00:00 2001
From: sensuikan1973 <23427957+sensuikan1973@users.noreply.github.com>
Date: Wed, 31 Jan 2024 08:58:09 +0900
Subject: [PATCH] Update bump_ruby_and_bundler_version.yaml

---
 .github/workflows/bump_ruby_and_bundler_version.yaml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/bump_ruby_and_bundler_version.yaml b/.github/workflows/bump_ruby_and_bundler_version.yaml
index 829484dc4..e48bf48be 100644
--- a/.github/workflows/bump_ruby_and_bundler_version.yaml
+++ b/.github/workflows/bump_ruby_and_bundler_version.yaml
@@ -53,11 +53,7 @@ jobs:
             dependencies
             mac
 
-      # See: https://github.com/peter-evans/create-pull-request/tree/main#auto-merge
       - name: enable auto-merge
-        if: steps.create_pull_request.outputs.pull-request-operation == 'created'
-        uses: peter-evans/enable-pull-request-automerge@v3
-        with:
-          token: ${{ secrets.PAT }}
-          pull-request-number: ${{ steps.create_pull_request.outputs.pull-request-number }}
-          merge-method: squash
+        run: gh pr merge ${{ steps.create_pull_request.outputs.pull-request-number }} --squash --auto
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}