Updated protobuf to 4.24.4 #27

Open

biodranik wants to merge 1 commit from ab-protobuf into master

biodranik commented

2023-10-15 07:28:06 +00:00

(Migrated from github.com)

@pastk

vng (Migrated from github.com) reviewed 2023-10-15 07:28:06 +00:00

pastk approved these changes 2023-10-15 07:32:48 +00:00

README.md

pastk commented

2023-10-15 07:29:53 +00:00

Member

Updating protobuf in the repo should be synced with Kothic.

```suggestion Updating protobuf in the repo should be synced with Kothic. ```

biodranik commented

2023-10-15 07:49:03 +00:00

(Migrated from github.com)

@pastk regenerating drules with newer protobuf from this branch doesn't show any local changes. Is it expected?

pastk commented

2023-10-15 08:38:22 +00:00

Member

Looks like the binary format didn't change (at least in the part used by us).

pastk commented

2024-05-09 21:48:07 +00:00

Member

@AndrewShkrob There is a tools/python/stylesheet/drules_struct_pb2.py file in the main repo which hasn't been updated accordingly, this versions discrepancy is likely causing https://github.com/organicmaps/organicmaps/pull/8113#issuecomment-2103449554

Probably all scripts should be changed to use the drules_struct_pb2.py file from the kothic repo?

@AndrewShkrob There is a `tools/python/stylesheet/drules_struct_pb2.py` file in the main repo which hasn't been updated accordingly, this versions discrepancy is likely causing https://github.com/organicmaps/organicmaps/pull/8113#issuecomment-2103449554 Probably all scripts should be changed to use the `drules_struct_pb2.py` file from the kothic repo?

This pull request has changes conflicting with the target branch.

README.md
requirements.txt

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin ab-protobuf:ab-protobuf

git checkout ab-protobuf

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master

git merge --no-ff ab-protobuf

git checkout ab-protobuf

git rebase master

git checkout master

git merge --ff-only ab-protobuf

git checkout ab-protobuf

git rebase master

git checkout master

git merge --no-ff ab-protobuf

git checkout master

git merge --squash ab-protobuf