From b3cdada612546e03424a7f58493190b61a35e811 Mon Sep 17 00:00:00 2001 From: panicboat Date: Thu, 20 Aug 2026 23:50:42 +0900 Subject: [PATCH 1/2] fix(auto-approve): use hmarr/auto-approve-action instead of a deleted local action Signed-off-by: panicboat --- .github/workflows/auto-approve.yaml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/auto-approve.yaml b/.github/workflows/auto-approve.yaml index bb5fd10..541209c 100644 --- a/.github/workflows/auto-approve.yaml +++ b/.github/workflows/auto-approve.yaml @@ -11,7 +11,10 @@ permissions: jobs: auto-approve: runs-on: ubuntu-latest - if: endsWith(github.actor, '[bot]') + # panicboat-ci-bot (= the App whose token this job uses) cannot approve its + # own PRs (release-please); GitHub rejects self-approval with 422. Those + # need a human review instead. + if: endsWith(github.actor, '[bot]') && github.event.pull_request.user.login != 'panicboat-ci-bot[bot]' steps: - name: Generate GitHub App token id: app-token @@ -20,14 +23,7 @@ jobs: app-id: ${{ vars.APP_ID }} private-key: ${{ secrets.APP_PRIVATE_KEY }} - - name: Checkout code - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - name: Auto-approve + uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0 with: - token: ${{ steps.app-token.outputs.token }} - fetch-depth: 1 - - - name: Auto-approve and Merge - uses: ./auto-approve - with: - token: ${{ steps.app-token.outputs.token }} - auto-merge-label: 'automerge' + github-token: ${{ steps.app-token.outputs.token }} From e573d117292a89ed358a129863e93f97ffa765c1 Mon Sep 17 00:00:00 2001 From: panicboat Date: Fri, 21 Aug 2026 00:16:14 +0900 Subject: [PATCH 2/2] docs(auto-approve): trim the skip-condition comment to one line Signed-off-by: panicboat --- .github/workflows/auto-approve.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/auto-approve.yaml b/.github/workflows/auto-approve.yaml index 541209c..e674965 100644 --- a/.github/workflows/auto-approve.yaml +++ b/.github/workflows/auto-approve.yaml @@ -11,9 +11,7 @@ permissions: jobs: auto-approve: runs-on: ubuntu-latest - # panicboat-ci-bot (= the App whose token this job uses) cannot approve its - # own PRs (release-please); GitHub rejects self-approval with 422. Those - # need a human review instead. + # panicboat-ci-bot can't approve its own PRs; GitHub rejects that with 422. if: endsWith(github.actor, '[bot]') && github.event.pull_request.user.login != 'panicboat-ci-bot[bot]' steps: - name: Generate GitHub App token