Repository navigation
ci: GEN-022 merge queue trigger, cancel-superseded, end-of-queue cache janitor - #1748
Merged
Merged
Conversation
…e janitor Steps 1-2 of the forge-ci/ci.yml#432 transition for fbuild, rendered through ci/render_workflows.py: - ci-minimal.yml triggers on merge_group. - cancel-superseded (ci/cancel_superseded.py, ported from forge-ci/bosn#776) cancels older in-flight queue runs for the same PR (#409). - queue-cache-janitor needs every other job, runs on always() for merge_group, and holds the non-cancelling cache-janitor group (#405). - ci.toml grants both jobs actions: write and allows merge_group; local-gate.toml exempts cancel-superseded from verify. - test_fractional_workflows pins the new shape. No job runs ci-lint plan, so the linter pin is unchanged.
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the
 |
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.
Steps 1-2 of the merge-queue transition (forge-ci/ci.yml#432, GEN-022 #405/#409). References: forge-ci/bosn#776, forge-ci/zccache#1998, forge-ci/reld#225.
ci-minimal.yml(rendered byci/render_workflows.py;--checkclean) gainsmerge_group. On a queue run:linuxandselected-coveragerun,board_plan/fbuild_bin/pr_boards/test/fullskip (PR-only),verifyprints its advisory line.cancel-supersededjob +ci/cancel_superseded.py(copied from bosn).queue-cache-janitor: needs every other job,always()on merge_group,cache-janitorgroup with cancel-in-progress false.ci.toml:actions: writefor both jobs;merge_groupallowed for ci-minimal.yml.local-gate.toml:verify-exempt = ["cancel-superseded"].ci/test_fractional_workflows.pypins the new job set, the janitor's needs/if/concurrency, and the trigger.ci-lint plan.Known tradeoff: the janitor checks out ci-lint at 953c4e1, not ci.toml's linter pin b93b8c4, because b93b8c4 predates #405's repo-wide LRU budget pass and
--default-branch. That adds one CT-004 finding. Clear it by bumpinglinter(andCI_LINT_SHA) in a follow-up.ci-lint precheck --local(forge-ci/ci.yml main): GEN-022 gone; the only new finding is that CT-004. The fractional/local-gate tests pass (31). Not gated locally: the gate is in shadow mode.Not done here: enabling the queue in the main ruleset (step 3). Checks a merge_group run reports:
linux / Check (ubuntu-latest),linux / Python facade tests (ubuntu-latest),CI selected coverage,Verify local gate(continue-on-error). Housekeeping, not for the ruleset: Cancel superseded queue runs, End-of-queue cache janitor, plus skipped PR-only jobs. Note: the current required checkDylintcomes from dylint.yml, which has no merge_group trigger, so it must come out of the queue's required set or dylint.yml needs its own merge_group step.