Skip to content

relax version check #696

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Nov 28, 2020
Merged

relax version check #696

merged 2 commits into from
Nov 28, 2020

Conversation

nmeum
Copy link
Contributor

@nmeum nmeum commented Nov 28, 2020 •
edited by lhchavez
Loading

Fixes: #695

nmeum added 2 commits November 28, 2020 19:27
@nmeum
Allow compilation with libgit2 versions with >= minor version number
6ced15e 
The major version must still be an exact match since libgit2 uses
semantic versioning and changes to the major number indicate backwards
incompatible changes to the API.

Fixes #695
@nmeum
CI: Add libgit2 version matrix to build-system-dynamic job
635e542
lhchavez
lhchavez reviewed Nov 28, 2020
View reviewed changes
Copy link
Contributor

@lhchavez lhchavez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for doing this, it looks good overall! we just need to make the CI green and we're good to merge 🚀

@nmeum nmeum changed the title [WIP] relax version check relax version check Nov 28, 2020
@lhchavez lhchavez merged commit 1fabe95 into libgit2:master Nov 28, 2020
@nmeum
Copy link
Contributor Author

nmeum commented Nov 28, 2020

How does backporting this to other branches work? Even if the commit is cherry-picked the supported libgit2 version in the CI matrix needs to be adjusted for the other release branches.

@lhchavez
Copy link
Contributor

How does backporting this to other branches work? Even if the commit is cherry-picked the supported libgit2 version in the CI matrix needs to be adjusted for the other release branches.

normally that's done through a GitHub action (https://github.com/libgit2/git2go/runs/1468017967?check_suite_focus=true), but it seems like the merge conflicts prevented that from happening :/ so it'll need to be done by hand. i can do that tomorrow, or you can give it a try by running git cherry-pick -x 1fabe95fb7275df980ff6ab03fb85eac91c5849d from the release-1.0 branch and submit a PR for that.

@nmeum nmeum mentioned this pull request Nov 29, 2020
Merged
lhchavez pushed a commit that referenced this pull request Nov 30, 2020
@nmeum
Relax libgit2 minor version check (#696) (#697)
30caea3 
The major version must still be an exact match since libgit2 uses
semantic versioning and changes to the major number indicate backwards
incompatible changes to the API.

Fixes: #695
(cherry picked from commit 1fabe95)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhchavez lhchavez lhchavez approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

libgit2 version check
2 participants
@nmeum @lhchavez