Skip to content

merge queue: checking main (9f4beac) and #12426 together - #12504

Closed
mergify[bot] wants to merge 3 commits into
mainfrom
mergify/merge-queue/5051e25c87
Closed

merge queue: checking main (9f4beac) and #12426 together#12504
mergify[bot] wants to merge 3 commits into
mainfrom
mergify/merge-queue/5051e25c87

Conversation

@mergify

@mergify mergify Bot commented Aug 24, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch main (9f4beac) and #12426 are queued together for merge.

This pull request has been created by Mergify to check the mergeability of #12426.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue rule default for merge:

Required conditions to stay in the queue:

---
checking_base_sha: 9f4beace03259febcc637670c648da1aeeb415e3
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 12426
    scopes: []
scopes: []
...

jd and others added 3 commits August 24, 2026 10:31
@jd
fix(test-insights): make the closing CTA one partial, not eleven copies
a2f4cc7 
Every test framework recipe ends by sending the reader to the Test Insights
dashboard, and each one carried its own copy of that sentence. Ten of the copies
had drifted onto `https://dashboard.mergify.com/test-insights/jobs`, which is not
a page — Test Insights has Prevention, Detection and Mitigation — and an
eleventh named the dashboard with no link at all. #12490 has since corrected all
eleven in place, so the links work today; what it could not fix is why one stale
URL became ten broken links, which is that the sentence exists eleven times.

So the paragraph becomes `_review-in-test-insights.mdx`, included by the
recipes. The rendered text is byte-identical to what #12490 shipped; the next
time that link moves it is one edit rather than eleven, and a recipe cannot
quietly drift out of step with its siblings again. Shared partials are already
how these files handle the Buildkite quarantine setup and the upload steps.

Separately, two inline GitHub Actions examples were missing the
`continue-on-error: true` that the quarantine partial they include requires:
the Gradle example in the JUnit recipe and the `rake test` example in the
Minitest one. Without it a failing test step ends the job before the upload step
runs, so the run that most needs a report produces none — and in both files the
sibling example directly above already had the line, so this was drift rather
than a deliberate difference.

Part of MRGFY-8720

Change-Id: I482ec81d7710f37d83dcffdf65abc029b73437fc
@jd
fix(test-insights): stop pinning the Buildkite plugin to its first re…
f03d9da 
…lease

The two Buildkite upload snippets hardcode `mergifyio/mergify-ci#v1` in their
`.astro` source. `v1` is the oldest of six releases — `v1` through `v6` are
distinct tags, not a floating major — so every reader who copies one of these
snippets pins the first version ever cut and never receives anything shipped
since.

Nothing else in the docs does this. Every Buildkite page writes
`@@BUILDKITE_PLUGIN_VERSION@@`, which `plugins/remark-buildkite-version.ts`
substitutes from `src/data/buildkite-plugin-version.json` at build time. That
plugin only visits markdown nodes, so the sentinel does nothing inside an
`.astro` component and these two were left pinning by hand. The fix is the one
the GitHub Actions counterpart already uses: import the data file and
interpolate it, exactly as `MergifyCIUploadStepMatrix.astro` does with
`gha-mergify-ci-version.json`.

Bumping `v1` to `v6` would have recreated the same problem one release later.

This matters now because the commit at the bottom of this stack recommends the
plugin's `job_name` property again. A reader who copies the matrix snippet and
pins `v1` gets a plugin where that property predates the code reading it — the
docs would recommend a knob that is dead in the version the snippet installs.

The non-matrix component has the same pin and is the more widely used of the
two: eleven test-framework recipes render it. Both are fixed here, since it is
one bug with one cause.

Verified on the built output: all 78 rendered occurrences of the plugin
reference now read `v6`, none read `v1`, and no template literal leaked into
the HTML. `pnpm check` 0 errors, `pnpm build` 384 pages, `pnpm test` 144
passed, `pnpm check:internal-leaks` clean.

Refs MRGFY-8720

Change-Id: Ic5504d661f0c14e668fbb7b8cf55cf86b9dd5788
@mergify
Merge of #12426
9bd7202
@mergify
mergify Bot deployed to Mergify Merge Protections August 24, 2026 12:27 Active
@mergify mergify Bot mentioned this pull request Aug 24, 2026
Merged
@mergify mergify Bot closed this Aug 24, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/5051e25c87 branch August 24, 2026 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@jd