Repository navigation
ci: run macOS and Windows in a merge queue instead of on every push - #350
Merged
Merged
Conversation
bnb
approved these changes
Oct 31, 2026
bnb
approved these changes
Oct 31, 2026
Coverage Report for apps/web
File CoverageNo changed files found.SizeCompared with main. KiB are 1,024 bytes.
|
Coverage Report for apps/localtoolbox
File CoverageNo changed files found.SizeCompared with main. KiB are 1,024 bytes.
|
bnb
approved these changes
Oct 31, 2026
bnb
previously approved these changes
Oct 31, 2026
Pull requests and pushes to main run on Linux; locallibrary's macOS and Windows checks run once per merge queue group, or on a pull request with the all-os label, as one job per OS without coverage or shards. The Linux build, shards and coverage move into locallibrary-ci.yml, and locallibrary-cache.yml saves the other-os caches on main nightly. The ruleset gets a merge queue, and a policy checks that gated workflows run on merge_group when it has one.
botandbang
dismissed
bnb’s stale review
October 31, 2026 16:29
The merge-base changed after approval.
botandbang
force-pushed
the
bnb/ci-merge-queue
branch
from
October 31, 2026 16:29
df9429c to
05dc8b8
Compare
bnb
previously approved these changes
Oct 31, 2026
Rust coverageFrom run 7. Both are held to the thresholds in .cargo/config.toml.
|
The ruleset's code scanning rule waits for CodeQL's analysis of each merge queue group's commit, and holds the group until it gets one. A policy now fails when the ruleset has a merge queue and code scanning but codeql.yml doesn't run on merge_group.
bnb
approved these changes
Oct 31, 2026
2 of 4 tasks
bnb
approved these changes
Oct 31, 2026
2 tasks done
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
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 and why
Each locallibrary run asked for 6 macOS jobs (lint, build, 3 test shards, coverage), and the Free plan allows 5 at once. In a 21-hour sample, macOS sat at its cap for 160 minutes, and macOS and Windows jobs on pull requests were 31% of all job-minutes.
all-oslabel runs macOS and Windows too. The label is read from the API, so adding it and re-running CI is enough.ci.ymltriggers onmerge_group. A group runs only locallibrary's macOS and Windows job, since its pull requests already passed on Linux and the push to main runs Linux again.last-passeddiffs a group against the commit it goes on top of.other-os): clippy, doctests andcargo nextest run, with no coverage or shards. It has a 90-minute timeout, sized from Windows' times in run 41157262485. Coverage and its thresholds are Linux-only now.locallibrary-ci.ymland removedlocallibrary-ci-os.yml, which existed so each OS could fail on its own.locallibrary-cache.yml, which runsother-osnightly on main so its caches get saved there (shared-key: other-os).ruleset.rego: when the ruleset has a merge queue, every gated workflow triggers onmerge_group.all-oslabel, and updated the coverage comment in.cargo/config.tomland the docs.After merging: an admin applies the ruleset (
tools/ruleset.sh apply), then re-runs main's CI. Its ruleset check fails until the queue is on.How it was tested
tools/policy.sh: 72/72 Rego tests at full coverage, 48/48 conftest checks. Themerge_grouprule failed with the trigger removed.