ci: use gh cli apis

forcedotcom · Jan 8, 2025 · 39b9cae · 39b9cae
1 parent 42d9d29
commit 39b9cae
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -58,14 +58,6 @@ jobs:
                       }
 
             - name: Auto-Merge PR
-              uses: actions/github-script@v6
-              with:
-                  script: |
-                      const { pull_request } = context.payload;
-
-                      await github.rest.pulls.merge({
-                        owner: context.repo.owner,
-                        repo: context.repo.repo,
-                        pull_number: pull_request.number,
-                        merge_method: "squash", // other options are "merge" or "rebase"
-                      });
+              run: gh pr merge --auto --merge "$PR_URL"
+              env:
+                  PR_URL: ${{github.event.pull_request.html_url}}