From 93fc5fb59a2b79011d297b06c79e527d97ece292 Mon Sep 17 00:00:00 2001 From: Ivor Thibodo Date: Wed, 17 Jun 2026 15:30:15 -0500 Subject: [PATCH] ci(auto-merge): use botzo for auto-merge --- .github/workflows/auto-merge.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml index ea4d347..0cc6e12 100644 --- a/.github/workflows/auto-merge.yaml +++ b/.github/workflows/auto-merge.yaml @@ -5,24 +5,18 @@ on: jobs: auto-merge: - runs-on: ${{ vars.RUNNER_SMALL }} + runs-on: ubuntu-slim if: > github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'articulate-automation[bot]' steps: - - uses: actions/create-github-app-token@v3 - id: token - with: - client-id: ${{ vars.AUTOMATION_CLIENT_ID }} - private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }} - name: Approve PR env: - # Approve as Botzo to work around CODEOWNERS requirement GH_TOKEN: ${{ secrets.BOTZO_GH_TOKEN }} PR: ${{ github.event.pull_request.number }} run: gh pr review --approve "$PR" -R "$GITHUB_REPOSITORY" - name: Enable auto-merge env: - GH_TOKEN: ${{ steps.token.outputs.token }} + GH_TOKEN: ${{ secrets.BOTZO_GH_TOKEN }} PR: ${{ github.event.pull_request.number }} run: gh pr merge --auto --squash "$PR" -R "$GITHUB_REPOSITORY"