From 06724cfeb2246cef053dbe036e55580b61e878e8 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 7 Aug 2026 20:31:56 +0200 Subject: [PATCH] ci: checkout repo in bot auto-merge workflows (#6535) * ci: drop --delete-branch from reconcile auto-merge call The reconcile job runs without a git checkout, so gh pr merge --delete-branch fails with 'not a git repository' before enabling auto-merge. Auto-merge itself needs no local git state; branch cleanup is already handled by the PR-creating workflows. * ci: checkout repo in bot auto-merge workflows gh pr merge fails with 'not a git repository' when no checkout is present, which prevented the reconcile job from enabling auto-merge. Restore the checkout the previous approval workflow relied on. --- .github/workflows/bot-auto-merge-reconcile.yml | 3 +++ .github/workflows/bot-pr-automerge.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/bot-auto-merge-reconcile.yml b/.github/workflows/bot-auto-merge-reconcile.yml index 0bf7ea598..d82f759f5 100644 --- a/.github/workflows/bot-auto-merge-reconcile.yml +++ b/.github/workflows/bot-auto-merge-reconcile.yml @@ -12,6 +12,9 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 steps: + - name: Checkout code + uses: actions/checkout@v7 + - name: Obtain token id: obtainToken uses: actions/create-github-app-token@v3 diff --git a/.github/workflows/bot-pr-automerge.yml b/.github/workflows/bot-pr-automerge.yml index 62e604443..35c5461fa 100644 --- a/.github/workflows/bot-pr-automerge.yml +++ b/.github/workflows/bot-pr-automerge.yml @@ -20,6 +20,9 @@ jobs: github.event.pull_request.head.repo.full_name == github.repository && github.event.pull_request.base.ref == 'dev' steps: + - name: Checkout code + uses: actions/checkout@v7 + - name: Obtain token id: obtainToken uses: actions/create-github-app-token@v3