From 622e1dcfa5c1080a3d98ea09ac4f06b27785db9a Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 7 Aug 2026 20:12:37 +0200 Subject: [PATCH] ci: drop --delete-branch from reconcile auto-merge call (#6534) 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. --- .github/workflows/bot-auto-merge-reconcile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bot-auto-merge-reconcile.yml b/.github/workflows/bot-auto-merge-reconcile.yml index 3bc45c127..0bf7ea598 100644 --- a/.github/workflows/bot-auto-merge-reconcile.yml +++ b/.github/workflows/bot-auto-merge-reconcile.yml @@ -36,5 +36,5 @@ jobs: --jq '.[] | select(.author.login as $login | ["app/homarr-renovate", "app/homarr-crowdin", "app/homarr-update-contributors", "app/homarr-releases"] | index($login)) | select(.reviewDecision == "APPROVED") | select(.mergeStateStatus == "CLEAN") | select(.autoMergeRequest == null) | .number' \ | while read -r pr; do echo "Re-enabling auto-merge on PR #$pr" - gh pr merge "$pr" --auto --squash --delete-branch + gh pr merge "$pr" --auto --squash done