Style changes merge bottleneck #6167

New issue

Open

opened 2023-10-01 07:23:31 +00:00 by pastk · 0 comments

pastk commented

2023-10-01 07:23:31 +00:00

Member

Its great that we have more people contributing to styles lately! Many thanks to everyone involved! @RedAuburn @dvdmrtnz @map-per

However it made apparent that we have a shortcoming with our workflow:
there is a queue of style PRs waiting to be merged, but we can't merge them at once because after one is merged all other need to be rebased, which takes time and focus unnecessarily.

Merge conflicts are due to binary drules_*.bin files (and symbols.png skin files when icons are changes, but its not that big issue for now) which just can't be merged.

Also complete rewrite of binary files for every minor change makes our repository size grow bigger faster and faster (e.g. a single icon update leads to >6Mb of additional skin files versions).
Also each rebase and push makes the CI builds and tests run anew (takes time and there is a rate limit for free github CI, right?).

An ultimate solution would be to stop storing binary drules and skin files in the repo, but generate them on-the-fly from the sources e.g. just before building an app.

However there are many dependencies on those binaries ATM which make it a big task:

style binaries should be generated automatically/transparently for each platform build, so that a build env setup process is not more complicated
automatic tests run by github CI (which include styles-related tests) depend on style binaries too, so they have to be generated automatically there too (and it shouldn't slow down this process much)
similarly, the maps generator depends on style binaries too

So it would be great to find an interim simpler solution, let's brainstorm!

CC @biodranik @vng

Its great that we have more people contributing to styles lately! Many thanks to everyone involved! @RedAuburn @dvdmrtnz @map-per However it made apparent that we have a shortcoming with our workflow: there is a queue of style PRs waiting to be merged, but we can't merge them at once because after one is merged all other need to be rebased, which takes time and focus unnecessarily. Merge conflicts are due to binary `drules_*.bin` files (and `symbols.png` skin files when icons are changes, but its not that big issue *for now*) which just can't be merged. Also complete rewrite of binary files for every minor change makes our repository size grow bigger faster and faster (e.g. a single icon update leads to >6Mb of additional skin files versions). Also each rebase and push makes the CI builds and tests run anew (takes time and there is a rate limit for free github CI, right?). An ultimate solution would be to stop storing binary drules and skin files in the repo, but generate them on-the-fly from the sources e.g. just before building an app. However there are many dependencies on those binaries ATM which make it a big task: - style binaries should be generated automatically/transparently for each platform build, so that a build env setup process is not more complicated - automatic tests run by github CI (which include styles-related tests) depend on style binaries too, so they have to be generated automatically there too (and it shouldn't slow down this process much) - similarly, the maps generator depends on style binaries too So it would be great to find an interim simpler solution, let's brainstorm! CC @biodranik @vng

👍 2

This repo is archived. You cannot comment on issues.