From b19ed9e07fdaac54c4221a268aad8e3ef4b6341a Mon Sep 17 00:00:00 2001 From: Edouard Gouilliard Date: Mon, 20 Apr 2026 11:43:52 +0100 Subject: [PATCH] =?UTF-8?q?revert(workflow):=20remove=20auto-merge=20?= =?UTF-8?q?=E2=80=94=20PR=20approval=20stays=20manual?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 (1M context) --- .archon/workflows/dev-pipeline.yaml | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/.archon/workflows/dev-pipeline.yaml b/.archon/workflows/dev-pipeline.yaml index daeb8e8..bf104d4 100644 --- a/.archon/workflows/dev-pipeline.yaml +++ b/.archon/workflows/dev-pipeline.yaml @@ -1076,32 +1076,3 @@ nodes: If nothing to close, say "No additional issues resolved." - # ═══════════════════════════════════════════════════════════════ - # Step 14: Auto-merge PR - # ═══════════════════════════════════════════════════════════════ - - - id: auto-merge - depends_on: [close-fixed-issues] - bash: | - echo "=== Auto-merge ===" - - # Find the PR created by this workflow (most recent open PR from this branch) - BRANCH=$(git branch --show-current) - PR=$(gh pr list --state open --head "$BRANCH" --json number --jq '.[0].number' 2>/dev/null) - - if [ -z "$PR" ]; then - echo "No open PR found for branch $BRANCH — skipping merge" - exit 0 - fi - - echo "Merging PR #$PR..." - gh pr merge "$PR" --merge --admin 2>&1 - - if [ $? -eq 0 ]; then - echo "PASS: PR #$PR merged" - else - echo "WARN: PR merge failed — may need manual merge" - fi - - echo "DONE" - timeout: 60000