Deduplicate merge queue/main CI attempt 2 - #16478
Open
Jakeii wants to merge 3 commits into
Open
Conversation
Jakeii
force-pushed
the
jlk/optimise-merge-queue-ci
branch
2 times, most recently
from
July 28, 2026 11:51
e758aae to
9c55a31
Compare
Co-authored-by: Copilot <copilot@github.com>
Jakeii
added
the
maintenance
Jakeii
force-pushed
the
jlk/optimise-merge-queue-ci
branch
from
July 28, 2026 11:52
9c55a31 to
ce6e926
Compare
Jakeii
added
run_chromatic
Jakeii
marked this pull request as ready for review
July 28, 2026 14:56
github-actions
Bot
removed
the
run_chromatic
alexduf
approved these changes
Jul 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this change?
Refine our workflows so that most checks run either in the merge group or on merge to
main, as they are run against the exact same commit/code. Demonstrated by the way github shows both push and merge_group results in the PR checks:So with these changes, jobs now generally run on
pull_requestandmerge_groupevents, no longer thepushevent (which runs on push to main or pushes to PRs), just thecicd.ymlworkflow still runs onpush(to main) so that it can publish the artifact to riff-raff.Why?
Running everything on both is a waste of time/github action compute/chromatic tokens.