Skip to content

feat(update-deps): merge the PR to completion on a main-branch run#534

Merged
stevensacks merged 2 commits into
mainfrom
feat/update-deps-merge-on-main
Jul 3, 2026
Merged

feat(update-deps): merge the PR to completion on a main-branch run#534
stevensacks merged 2 commits into
mainfrom
feat/update-deps-merge-on-main

Conversation

@stevensacks

Copy link
Copy Markdown
Contributor

What

/update-deps now completes the flow on a main/master run: it opens the PR and merges it once the required checks are green, then cleans up the local checkout. On any other branch it still pushes and leaves the PR to the branch owner. CI behavior is unchanged.

Changes (Phase 8)

  • Explicit commit step. Phase 8 previously referenced "the update commit" and pushed, but never wrote a git commit. It now stages and commits with a load-bearing chore(deps): (or chore(deps-dev):) subject, which triggers the dep-bump bypass in the merge gate so the PR is turnkey-mergeable without a code-review-audit marker. The message routes through a file (not -m) to dodge shell-hook false positives on package-manager keywords.
  • Merge-on-main. After opening the PR, the main-branch path runs gh pr merge <N> --squash --delete-branch --auto (falling back to a plain merge if the repo has auto-merge disabled), polls for the terminal MERGED state before touching the local checkout, then cleans up (git checkout main && git pull, git branch -D, git fetch --prune). If auto-merge is still queued when the poll window closes, it prints the PR URL and leaves the branch in place.
  • Branch / CI path unchanged. A run on a non-main branch (or in CI) pushes and does not open a PR or merge.

The merge follows wiki/concepts/PR Merge Workflow.md (safe merge + post-merge verification pattern).

Merge gate

This PR's diff is entirely out of audit scope (.claude/ + root CHANGELOG.md), so the out-of-scope bypass clears the merge without a code-review-audit marker.

On a main/master run, Phase 8 now commits with a chore(deps) subject, opens
the PR, merges it once the required checks are green (--auto under branch
protection), verifies the terminal MERGED state, and cleans up the local
checkout. On any other branch it still pushes and leaves the PR to the branch
owner; CI is unchanged.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@github-actions

github-actions Bot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

code-review-audit skipped: no audit-relevant files changed in the un-audited delta (since the last clean audit); GAIA-Audit commit status stamped on HEAD so the merge gate is satisfied with no local audit run

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@github-actions

github-actions Bot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

code-review-audit skipped: no audit-relevant files changed in the un-audited delta (since the last clean audit); GAIA-Audit commit status stamped on HEAD so the merge gate is satisfied with no local audit run

@stevensacks stevensacks enabled auto-merge (squash) July 3, 2026 07:23
@stevensacks stevensacks merged commit 65aeeb5 into main Jul 3, 2026
7 checks passed
@stevensacks stevensacks deleted the feat/update-deps-merge-on-main branch July 3, 2026 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant