From 95e771eb823db4e97558ba1baa1df45aeb7e3fc1 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Mon, 3 Apr 2023 12:01:59 +0200 Subject: [PATCH] ci: Use GitHub CLI for automerge As pointed out here: https://github.com/getsentry/sentry-javascript/pull/7705 we can replace this with core functionality. --- .github/workflows/gitflow-sync-develop.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/gitflow-sync-develop.yml b/.github/workflows/gitflow-sync-develop.yml index b56feb2b0a79..374e83aeda65 100644 --- a/.github/workflows/gitflow-sync-develop.yml +++ b/.github/workflows/gitflow-sync-develop.yml @@ -38,13 +38,8 @@ jobs: # This token is scoped to Daniel Griesser github_token: ${{ secrets.REPO_SCOPED_TOKEN }} - # https://github.com/marketplace/actions/enable-pull-request-automerge - name: Enable automerge for PR - if: steps.open-pr.outputs.pr_number != '' - uses: peter-evans/enable-pull-request-automerge@v2 - with: - pull-request-number: ${{ steps.open-pr.outputs.pr_number }} - merge-method: merge + run: gh pr merge --merge --auto "1" # https://github.com/marketplace/actions/auto-approve - name: Auto approve PR