ci: add changeset merge guard for merge queue

[alexprudhomme]

https://coveord.atlassian.net/browse/KIT-5622

Changeset merge guard

Adds a changeset-merge-guard job to the existing CI workflow (ci.yml) that prevents stale version PRs from being merged through the merge queue.

Problem

When a version PR (ci(changesets): version packages) and a changeset-adding PR enter the merge queue in the same batch, they can merge together. The CD then finds unprocessed changesets and enters "create PR" mode instead of publishing — delaying the release by one cycle.

Solution

A new changeset-merge-guard job in ci.yml (which already triggers on merge_group) that:

1. Scans commits in the merge group for version PR pattern
2. If found, checks for any unprocessed .changeset/*.md files
3. Fails the batch if both are present → GitHub bisects → they merge separately

The job is wired into is-valid-merge-queue so failures propagate to Confirm build is valid.

Behavior matrix

Batch	Version PR?	Changesets remain?	Check	Outcome
A only	No	No	✅ Pass	No publish
B only	Yes	No	✅ Pass	Publishes ✅
C only	No	Yes	✅ Pass	Creates version PR
A + B	Yes	No	✅ Pass	Publishes ✅
A + C	No	Yes	✅ Pass	Creates version PR
B + C	Yes	Yes	❌ Fail	Bisects → B publishes, C creates version PR
A + B + C	Yes	Yes	❌ Fail	Bisects → A+B publish, C creates version PR

All 13 scenarios (including edge cases) tested locally with act.

Prerequisites

Merge queue must be enabled on main for the merge_group trigger to fire.

[changeset-bot]

⚠️ No Changeset found

Latest commit: 2b88a7e

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

[svcsnykcoveo]

✅ Snyk checks have passed. No issues have been found so far.

Status	Scan Engine	Critical	High	Medium	Low	Total (0)
✅	Open Source Security	0	0	0	0	0 issues
✅	Licenses	0	0	0	0	0 issues
✅	Code Security	0	0	0	0	0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

[Copilot]

Pull request overview

Improves the resilience of the CD workflow when the Changesets “Version Packages” branch is blocked by GitHub’s merge queue, preventing the workflow from failing in that scenario.

Changes:

• Add continue-on-error: true to the changesets/action step in the CD workflow.

[pkg-pr-new]

Open in StackBlitz

@coveo/atomic

npm i https://pkg.pr.new/@coveo/atomic@7440

@coveo/atomic-hosted-page

npm i https://pkg.pr.new/@coveo/atomic-hosted-page@7440

@coveo/atomic-legacy

npm i https://pkg.pr.new/@coveo/atomic-legacy@7440

@coveo/atomic-react

npm i https://pkg.pr.new/@coveo/atomic-react@7440

@coveo/auth

npm i https://pkg.pr.new/@coveo/auth@7440

@coveo/bueno

npm i https://pkg.pr.new/@coveo/bueno@7440

@coveo/create-atomic

npm i https://pkg.pr.new/@coveo/create-atomic@7440

@coveo/create-atomic-component

npm i https://pkg.pr.new/@coveo/create-atomic-component@7440

@coveo/create-atomic-component-project

npm i https://pkg.pr.new/@coveo/create-atomic-component-project@7440

@coveo/create-atomic-result-component

npm i https://pkg.pr.new/@coveo/create-atomic-result-component@7440

@coveo/create-atomic-rollup-plugin

npm i https://pkg.pr.new/@coveo/create-atomic-rollup-plugin@7440

@coveo/headless

npm i https://pkg.pr.new/@coveo/headless@7440

@coveo/headless-react

npm i https://pkg.pr.new/@coveo/headless-react@7440

@coveo/shopify

npm i https://pkg.pr.new/@coveo/shopify@7440

commit: 2b88a7e