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.

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

libgit2: add version 1.7.2, support conan v2 #18458

Merged
merged 30 commits into from
May 7, 2024
Merged

libgit2: add version 1.7.2, support conan v2 #18458

merged 30 commits into from
May 7, 2024

Conversation

toge
Copy link
Contributor

@toge toge commented Jul 10, 2023

Specify library name and version: libgit2/*

@prince-chrismc prince-chrismc mentioned this pull request Jul 10, 2023
Open
@conan-center-bot

This comment has been minimized.

Sign in to view
@ericLemanissier ericLemanissier mentioned this pull request Jul 10, 2023
Closed
This was referenced Jul 10, 2023
Open
Closed
@conan-center-bot

This comment has been minimized.

Sign in to view
@toge toge changed the title libgit2: add version 1.6.4, support conan v2 libgit2: add version 1.7.0, support conan v2 Jul 18, 2023
@conan-center-bot

This comment has been minimized.

Sign in to view
This was referenced Jul 18, 2023
Closed
Closed
@ghost
Copy link

ghost commented Jul 18, 2023 •
edited by ghost
Loading

I detected other pull requests that are modifying libgit2/all recipe:

This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there.

@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@toge toge changed the title libgit2: add version 1.7.1, support conan v2 libgit2: add version 1.7.2, support conan v2 Feb 11, 2024
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@toge
Copy link
Contributor Author

toge commented Feb 21, 2024

@uilianries
There are still missing dependencies.
Would you rebuild binaries?

@uilianries
Copy link
Member

@toge Sorry the incident, I guess it failed during the tapaholes. I just pushed to be built it again. Thank you for reporting!

valgur
valgur suggested changes Mar 5, 2024
View reviewed changes
Copy link
Contributor

@valgur valgur left a comment

Choose a reason for hiding this comment

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

Some minor tweaks are required. I would drop 0.27 as well. Maybe 0.28 also, but it's the latest v0.x version on CCI so it's still marginally useful in that regard, possibly.

recipes/libgit2/0.27.x/conanfile.py Outdated
import os

required_conan_version = ">=1.45.0"

required_conan_version = ">=1.53.0"


class LibGit2Conan(ConanFile):
Copy link
Contributor

Choose a reason for hiding this comment

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

package_type is missing.

recipes/libgit2/0.27.x/conandata.yml Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe the 0.27 recipe can be dropped altogether.

recipes/libgit2/0.27.x/conanfile.py Outdated
tc.variables["USE_HTTPS"] = self._cmake_https[str(self.options.with_https)]
tc.variables["SHA1_BACKEND"] = self._cmake_sha1[str(self.options.with_sha1)]
tc.variables["BUILD_CLAR"] = False
tc.variables["BUILD_EXAMPLES"] = False
Copy link
Contributor

Choose a reason for hiding this comment

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

Need to set CMP0077 to NEW for tc.variables.

recipes/libgit2/all/conanfile.py Show resolved Hide resolved
recipes/libgit2/0.28.x/conanfile.py Outdated
tc.variables["THREADSAFE"] = self.options.threadsafe
tc.variables["USE_SSH"] = self.options.with_libssh2
tc.variables["USE_ICONV"] = self.options.get_safe("with_iconv", False)
tc.variables["USE_HTTPS"] = self._cmake_https[str(self.options.with_https)]
Copy link
Contributor

Choose a reason for hiding this comment

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

The False value in the dict is not a string.

recipes/libgit2/all/conanfile.py Show resolved Hide resolved
@callmerockett callmerockett mentioned this pull request Mar 7, 2024
Closed
@toge toge marked this pull request as draft March 26, 2024 08:57
@conan-center-bot

This comment has been minimized.

Sign in to view
@github-actions GitHub Actions
Copy link
Contributor

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@github-actions github-actions bot added the stale label Apr 28, 2024
@AbrilRBS
Copy link
Member

Hi @toge - I'm now trying to come back to this PR, sorry about the delay.

My one main question is if you have any insight into keeping the old 0.x releases, I think we could simplify a lot if only the all recipe would be kept! :)

@AbrilRBS AbrilRBS marked this pull request as ready for review April 29, 2024 09:02
@conan-center-bot

This comment has been minimized.

Sign in to view
@AbrilRBS AbrilRBS requested a review from valgur April 29, 2024 10:18
@toge
Copy link
Contributor Author

toge commented Apr 29, 2024

@RubenRBS
I agree with you.
I will try to remove 0.x releases.

@toge toge marked this pull request as draft April 29, 2024 10:40
@AbrilRBS
Copy link
Member

Hi! I went ahead and removed them and updated the recipe to use version ranges, sorry I didnt notify you sooner! :)

@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 3 (33f0fcb10303d303becc4ff342ec489f49d1d28d):

  • libgit2/1.7.2:
    All packages built successfully! (All logs)

  • libgit2/1.4.3:
    All packages built successfully! (All logs)

  • libgit2/1.2.0:
    All packages built successfully! (All logs)

  • libgit2/1.5.0:
    All packages built successfully! (All logs)

  • libgit2/1.3.0:
    All packages built successfully! (All logs)

  • libgit2/1.1.1:
    All packages built successfully! (All logs)

  • libgit2/1.0.1:
    All packages built successfully! (All logs)

Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 3 (33f0fcb10303d303becc4ff342ec489f49d1d28d):

  • libgit2/1.7.2:
    All packages built successfully! (All logs)

  • libgit2/1.5.0:
    All packages built successfully! (All logs)

  • libgit2/1.3.0:
    All packages built successfully! (All logs)

  • libgit2/1.0.1:
    All packages built successfully! (All logs)

  • libgit2/1.2.0:
    All packages built successfully! (All logs)

  • libgit2/1.4.3:
    All packages built successfully! (All logs)

  • libgit2/1.1.1:
    All packages built successfully! (All logs)

@toge
Copy link
Contributor Author

toge commented Apr 29, 2024

@RubenRBS
Oh, I see.

@toge toge marked this pull request as ready for review April 29, 2024 11:47
uilianries
uilianries reviewed May 7, 2024
View reviewed changes
recipes/libgit2/all/conanfile.py
cmake.configure()
return cmake
tc.variables["STATIC_CRT"] = is_msvc_static_runtime(self)
# REGEX_BACKEND is SET(), avoid options overriding it
Copy link
Member

Choose a reason for hiding this comment

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

Thank you for commenting the motivation! It helps a lot!

recipes/libgit2/all/patches/1.7.2-0001-fix-cmake.patch
@@ -1,10 +1,10 @@
# Optional external dependency: http-parser
if(USE_HTTP_PARSER STREQUAL "system")
- find_package(HTTPParser)
Copy link
Member

Choose a reason for hiding this comment

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

We could use CMakeDeps with set_property to change the cmake file name, but variables are still not possible to change, so this change looks okay.

AbrilRBS
AbrilRBS approved these changes May 7, 2024
View reviewed changes
Copy link
Member

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

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

Thanks a lot @toge, sorry this one took so long to get merged :)

@conan-center-bot conan-center-bot merged commit 268139a into conan-io:master May 7, 2024
43 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jwillikers jwillikers jwillikers approved these changes

@AbrilRBS AbrilRBS AbrilRBS approved these changes

@uilianries uilianries uilianries approved these changes

@jcar87 jcar87 Awaiting requested review from jcar87

@valgur valgur Awaiting requested review from valgur

Assignees

@AbrilRBS AbrilRBS

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@toge @conan-center-bot @uilianries @AbrilRBS @AlexandrePTJ @valgur @jwillikers