Repository navigation
ci(sync-matrix): replace same-sublevel rows instead of stacking duplicates - #345
Closed
TheWildJames wants to merge 2 commits into
Closed
TheWildJames wants to merge 2 commits into
TheWildJames wants to merge 2 commits into
Conversation
…cates When a monthly release republishes a sublevel already in the matrix (e.g. 6.1.145 arriving for a new month, or an older row parked as disabled), the sync now removes the superseded row(s) and keeps exactly one row per sublevel, so a numeric sublevel always resolves to a single month. Removed rows are reported under a 'Replaced rows' section in the sync PR body, and a small helper (.github/scripts/update_kernel_matrix.py) does the same add-or-replace by hand plus an optional --dedupe sweep.
There was a problem hiding this comment.
Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota.
An organization owner can choose the repository organization as the billing source for reviews requested by members with a paid Copilot license. Learn about Copilot code review billing.
The replaced-rows note was only written when creating the PR; a re-sync that supersedes rows against an already-open PR pushed the new configs with nothing in the PR explaining them. Build the body once and edit the existing PR in place.
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
The daily matrix sync (
.github/workflows/sync-matrix.yml) appended a row for every new upstream month and never removed duplicates, so a sublevel could resolve to several rows. Example in the current tree:android14-6.1carries two145rows (2025-08parked asdisabledand2025-09), andandroid13-5.10carries six107rows.Now, when a month resolves to a sublevel already present, the sync removes the superseded row(s) and appends the new one — one row per sublevel, so a numeric
os_patch_levelalways maps to exactly one month.Replaced rows are called out in the PR
Every removed row is listed in the sync PR body under:
so no matrix change lands silently.
Also included
.github/scripts/update_kernel_matrix.py— same add-or-replace rule for manual fixes:--group android14-6.1 --sublevel 180 --date 2026-10, with--dedupefor a one-off sweep,--dry-run, and--pr-note <file>to append the change summary to a PR body.Verified
android14-6.1.json: adding145 @ 2025-10collapses two rows to one and emits tworeplacesnotes