From 9916faddd414f250cd334be1236ac300164fb2ca Mon Sep 17 00:00:00 2001 From: Arash Date: Mon, 23 Mar 2026 11:12:15 +0100 Subject: [PATCH] Refactor auto-merge bot workflow to use GitHub CLI for automerging PRs --- .github/workflows/auto-merge-bot.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-merge-bot.yaml b/.github/workflows/auto-merge-bot.yaml index ec1b2b702..a55355d01 100644 --- a/.github/workflows/auto-merge-bot.yaml +++ b/.github/workflows/auto-merge-bot.yaml @@ -7,6 +7,7 @@ on: jobs: automerge: runs-on: ubuntu-latest + if: github.event.pull_request.user.login == 'dockerhub-toolshed' steps: - uses: actions/create-github-app-token@v3 id: app-token @@ -14,7 +15,7 @@ jobs: app-id: 3114451 private-key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: daneden/enable-automerge-action@v1 - with: - github-token: ${{ steps.app-token.outputs.token }} - allowed-author: "dockerhub-toolshed" + - name: Enable Pull Request Automerge + run: gh pr merge --merge --auto "${{ github.event.pull_request.number }}" + env: + GH_TOKEN: ${{ steps.app-token.outputs.token }}