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

Workflow for updating CImg #137

Merged
merged 50 commits into from
Feb 2, 2024
Merged

Conversation

aaronliu0130
Copy link
Collaborator

How can we test this? Step-by-step instructions, please.

  1. Draft a release

What happened before?

We'd have to manually update CImg

What should happen with this fix?

CImg.h would auto-update if needed

Anything else we should know about this patch?

  1. Don't merge before the repository secret to be generated
  2. Ignore the astronomical amount of commits lol, they'll be squashed when I merge it.

@penguin359
Copy link
Contributor

Another possibility is including CImg.h by making the upstream repo a submodule in this one:

https://github.com/GreycLab/CImg

Submodules lock to a specific commit so the code won't change on you unless you commit a newer version in the parent repo. To do updates, you would still need to go into the child repo and do a git pull origin master and then, if it compiles and runs correctly, git commit the newer submodule in the parent repo, but it might be easier to track. The downside to submodules is it can require more work on the user doing a checkout. They have to git submodule update --init on their first checkout but it does keep a nice separation between code bases.

@aaronliu0130
Copy link
Collaborator Author

I’ve considered that, but cloning the CImg repo requires downloading a lot more stuff than the library, including every single postcard the developers have received.

@aaronliu0130 aaronliu0130 merged commit a216fc6 into stefanhaustein:master Feb 2, 2024
1 check passed
@aaronliu0130 aaronliu0130 deleted the cimg branch February 2, 2024 21:28
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.

None yet

3 participants