Skip to content

feat(01KVVDTG): Every merge to the main branch starts a fresh CI run that reports pass or fail on the merge commit#442

Merged
jackmcintyre merged 1 commit into
mainfrom
story/native-01kvvdtgax1rf7kzwssfwdtw3c-every-merge-to-the-main-branch-starts-a
Jun 24, 2026
Merged

feat(01KVVDTG): Every merge to the main branch starts a fresh CI run that reports pass or fail on the merge commit#442
jackmcintyre merged 1 commit into
mainfrom
story/native-01kvvdtgax1rf7kzwssfwdtw3c-every-merge-to-the-main-branch-starts-a

Conversation

@jackmcintyre

Copy link
Copy Markdown
Owner

What changed

Every merge to the main branch starts a fresh CI run that reports pass or fail on the merge commit

This change delivers the following acceptance criteria:

  • AC1: Given a pull request has just been merged to the main branch, When the operator looks at the merge commit checks, Then a fresh continuous-integration run has started against that merge commit and resolves to a clear pass or fail, rather than a perpetually empty or pending status that never resolves.
  • AC2: Given a merge to main touches only files the run previously ignored (so today it produces no run at all), When that merge lands on main, Then a main-branch run still starts on the merge commit and re-validates the merged tree as a whole — including the committed plugin build-output drift check that only runs on main — instead of leaving the merge commit unchecked.

Why

As an operator who has just merged a pull request, I want every merge to the main branch to kick off a fresh continuous-integration run that reports a clear pass or fail on the merge commit, so that I can see whether the merged main is actually green instead of staring at a perpetually empty, pending status that hides a possible regression in the merged tree.

How to check it yourself

  1. Merge this PR. 2. Navigate to the merge commit on GitHub (Actions tab or commit checks). 3. Confirm a CI run has started against the merge commit and resolves to pass or fail (not empty/pending). 4. To verify the previously-ignored-files case: open a follow-up PR that touches only a non-plugin file (e.g. a root-level doc), merge it, and confirm a CI run still starts on that merge commit.

Risk and blast radius

Risk tier: medium

The change is scoped to the files in the diff below. Review the diff to judge its actual blast radius — including any effect on shared state, data schemas, or authentication paths — before approving.

What is explicitly not covered: reviewer verification of this summary's accuracy is handled by a separate companion story.

Evidence

The pre-pull-request build-and-test gate passed before this pull request was opened. No pull request can be opened by the automated flow unless both pnpm build and pnpm test exit 0 in the developer's working directory.

Per-criterion covering checks:

  • AC1 → verify at .github/workflows/ci.yml (not an automated test)
  • AC2 → verify at .github/workflows/ci.yml (not an automated test)

Story: native:01KVVDTGAX1RF7KZWSSFWDTW3C
Spec: .flow/native-stories/01KVVDTGAX1RF7KZWSSFWDTW3C.md
ACs:

  • AC1: Given a pull request has just been merged to the main branch, When the operator looks at the merge commit checks, Then a fresh continuous-integration run has started against that merge commit and resolves to a clear pass or fail, rather than a perpetually empty or pending status that never resolves.
  • AC2: Given a merge to main touches only files the run previously ignored (so today it produces no run at all), When that merge lands on main, Then a main-branch run still starts on the merge commit and re-validates the merged tree as a whole — including the committed plugin build-output drift check that only runs on main — instead of leaving the merge commit unchecked.

Remove paths filter from push-to-main trigger so every merge starts a CI run

…that reports pass or fail on the merge commit

Remove the `paths:` filter from the push-to-main trigger in
`.github/workflows/ci.yml` so that every merge to the main branch —
regardless of which files it touches — starts a fresh CI run that
resolves to a clear pass or fail on the merge commit. The pull_request
trigger retains its paths filter (no change to PR behaviour). This
restores unconditional main-branch re-validation, including the
dist-drift check that only runs on push events.
@jackmcintyre jackmcintyre merged commit a450d6d into main Jun 24, 2026
1 check passed
@jackmcintyre jackmcintyre deleted the story/native-01kvvdtgax1rf7kzwssfwdtw3c-every-merge-to-the-main-branch-starts-a branch June 24, 2026 04:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant