Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

thirdparty: update stb_image_resize2.h from 2.06 to 2.11 #22529

Merged
merged 2 commits into from
Oct 15, 2024

Conversation

larpon
Copy link
Contributor

@larpon larpon commented Oct 15, 2024

No description provided.

… to mark the specific places for easier future updates
@spytheman spytheman merged commit 78bdeca into vlang:master Oct 15, 2024
62 checks passed
@larpon larpon deleted the thirdparty/update-stbi-resize-2-h branch October 15, 2024 18:31
@larpon
Copy link
Contributor Author

larpon commented Oct 15, 2024

Sorry I missed those patches... maybe we could find a way that somehow warns if patches are missing in thirdparty code on PRs 🤔 (a bit like missdoc does a comparison)

@spytheman
Copy link
Member

That would be nice, but I do not know how would it work?
Counting the number of // __v_ start or ?

@spytheman
Copy link
Member

One easy strategy would be, to store the output of git grep -c '// __v_ start':
image

to a checked in file in thirdparty/, for example:
git grep -c '// __v_ start' > thirdparty/custom_patches.txt

Then the CI can just run that same grep command, and bail, if the output is different from the stored one.

@spytheman
Copy link
Member

People that make updates, can also easily update the file too, if they are sure, that everything is fine, to silence the CI.

@spytheman
Copy link
Member

spytheman commented Oct 17, 2024

It would not have discovered these custom patches (from the PR) though, since they were not marked with the // __v_ start (which is my bad - I should have added those markers in the first place).

(I knew where to search for them, because I merged the changes before, and also because of the failing CI jobs)

@larpon
Copy link
Contributor Author

larpon commented Oct 17, 2024

Yeah, hmm 🤔 I haven't thought the actual method through. It would just be nice to have. And you are right that it would not have triggered in this case anyway 🤷🏼‍♂️

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.

2 participants