Repository navigation
Description
Problem
The contributor lane's workflow-path fence (contributor-lane:workflow-path, src/pkg/github/automerge/automerge_contributor_lane.go) refuses to merge any PR touching .github/workflows/** / .github/actions/**, with no override. Since #14579, an owner's approval on such a PR routes it to stage/090-ready-for-human-merge with a "click Merge" caption — the hive still never merges it.
Live examples parked today, all approved by the owner (GitHub review APPROVED on the current head + dashboard decision approve, labels lgtm + stage/090):
- 🐛 fix(ci): measure runner stalls by queued job age #14568
- 🐛 fix: preserve merged price-table changelog fragments #14498
- 🌱 ci(mutation): shard nightly Stryker into cli/learner/rest so each shard seeds its incremental file rationguard#401
Owner's words: "if i approved it, it should auto merge".
Why the fence was absolute
automerge_contributor_adopt.go says "The App token cannot push" workflow files. That is no longer true for merging into the base: gh api /orgs/hivecommons/installations shows the hivecommons-hive App has workflows: write and contents: write. (Pushing to a fork branch is a separate matter and out of scope.)
Desired behaviour
- Explicit owner approval on a workflow-path PR is either (a) a GitHub pull-request review with state
APPROVEDon the current head by a trusted merger (the existingisTrustedMerger/SetMergerAuthorizernotion — the same bar/hive decisionalready uses), or (b) a/hive decision approve(dashboard approve) by such a login bound to the current head. Approval on an older head does not count; a new push re-arms the fence (stale approval → back to 090 with "re-approve after push"). - When approved, the fence is released and the PR goes through the normal merge gate (CI green, DCO, lgtm, no hold/do-not-merge, no sentinel-alert) and the hive merges it like any other PR. Log
workflow-path fence released by owner approval login=… head=…and leave one audit comment<!-- hive:workflow-approval head=… by=… -->per head. - If the merge call fails with a
workflowspermission error (some installs lack it), fall back to today's behaviour:hive:unauthorizedviamarkUnauthorized(stepmerge-workflow-path) and route to 090 "click Merge". Never loop. - Config toggle, default on:
auto_merge.contributor_lane.owner_approval_releases_workflow_fence: true(sibling ofapprove_held_runs_for_registry_trusted, ✨ feat(automerge): approve held workflow runs for registry-trusted contributors #14520). - Unapproved workflow-path PRs behave exactly as today.
- The 090 reason for an unapproved workflow-path PR should read "awaiting owner approval" rather than "hive never merges workflow files".
Activity
✨ merge: owner approval releases the workflow-path fence (#14672)
github-actions commentedon Oct 27, 2026
@clubanderson this issue was closed by @hivecommons-hive[bot] as completed.
If this was closed by a merged PR, the fix only takes effect once it ships in a tagged release and your deployment updates to it — check your running version against the fix before concluding the fix failed.
If you are still seeing the problem, comment
/reopenand it will be reopened for you — you do not need write access. Please add what you are still observing (running version, logs, steps) so it is not closed the same way again.🐛 fix(stage): make 085 asks agree on the workflow-path fence (#15026)
🔒 fix(contributor-lane): check removed tests before an owner approval…
🐛 adoption: gate in-place workflow base-sync on the fixer's own token…
🐛 adoption: keep a same-repo PR in place across a base workflow chang…