From 1ebc1a7d3c7e30d0042344a2c95ed9b51a820346 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Mar 2023 02:54:51 +0000 Subject: [PATCH] chore(deps): replace peter-evans/enable-pull-request-automerge with GitHub CLI (#612) * build(deps): bump peter-evans/enable-pull-request-automerge from 2 to 3 Bumps [peter-evans/enable-pull-request-automerge](https://github.com/peter-evans/enable-pull-request-automerge) from 2 to 3. - [Release notes](https://github.com/peter-evans/enable-pull-request-automerge/releases) - [Commits](https://github.com/peter-evans/enable-pull-request-automerge/compare/v2...v3) --- updated-dependencies: - dependency-name: peter-evans/enable-pull-request-automerge dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Update update-beta-branch.yaml --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> --- .github/workflows/update-beta-branch.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update-beta-branch.yaml b/.github/workflows/update-beta-branch.yaml index 43cf9adf23682..a75f074b292f5 100644 --- a/.github/workflows/update-beta-branch.yaml +++ b/.github/workflows/update-beta-branch.yaml @@ -107,8 +107,6 @@ jobs: - name: Enable auto-merge if: ${{ steps.create-pr.outputs.pull-request-operation == 'created' }} - uses: peter-evans/enable-pull-request-automerge@v2 - with: - token: ${{ steps.generate-token.outputs.token }} - pull-request-number: ${{ steps.create-pr.outputs.pull-request-number }} - merge-method: squash + run: gh pr merge --squash --auto "${{ steps.create-pr.outputs.pull-request-number }}" + env: + GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}