Skip to content

fix(ci): untrack the build-materialized lvgl usr files - #313

Merged
daniel-rossier merged 1 commit into
mainfrom
fix/ci-untrack-materialized-usr
Aug 10, 2026
Merged

fix(ci): untrack the build-materialized lvgl usr files#313
daniel-rossier merged 1 commit into
mainfrom
fix/ci-untrack-materialized-usr

Conversation

@daniel-rossier

@daniel-rossier daniel-rossier commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

The tree-wide e-mail alignment (#309) ran over a working tree that carried the lvgl build outputs and committed 37 of them: lib/lv_conf.h, the lib/slv/ sources, the quilt staging directory usr/patches/ and the materialized src/{fillfb,lvgl_*}.c. All of these are created by the lvgl patch set at build time, so on a fresh clone do_patch finds its own outputs already present and dies on the very first patch (would create lib/lv_conf.h, which already exists) — the Build workflow has been red since that merge (#309's own PR run already showed it), on every branch including v6.2.4.

  • git rm of the 37 files added by 02a56e0 (exactly the --diff-filter=A set of that commit)
  • .gitignore: the whole family is now ignored (usr/patches/, lib/slv/, lib/lv_conf.h, the materialized src/ sources) so it cannot come back

Note: the v6.2.4 tag carries the broken state — a fresh clone of the tag needs these paths cleaned before usr-so3 builds.

CI on this PR is the validation: the Build workflow should go green again.

The tree-wide e-mail alignment (#309) ran over a working tree that
carried the lvgl build outputs and committed 37 of them: lib/lv_conf.h,
the lib/slv/ sources, the quilt staging directory usr/patches/ and the
materialized src/{fillfb,lvgl_*}.c. All of these are created by the
lvgl patch set at build time, so on a fresh clone do_patch now finds
its own outputs already present and dies on the very first patch
('would create lib/lv_conf.h, which already exists') — the Build
workflow has been red since that merge, on every branch.

Remove them and gitignore the whole family so they cannot be committed
again. Note the v6.2.4 tag carries the broken state: a fresh clone of
the tag needs these paths cleaned before usr-so3 builds.
@daniel-rossier
daniel-rossier merged commit 62fb780 into main Aug 10, 2026
6 checks passed
@daniel-rossier
daniel-rossier deleted the fix/ci-untrack-materialized-usr branch August 10, 2026 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant