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

deps(if-watch): update if-watch to v3.2.1 #5758

Merged
merged 7 commits into from
Jan 12, 2025

Conversation

brenodt
Copy link
Contributor

@brenodt brenodt commented Dec 23, 2024

Description

Bumps the if-watch version to 3.2.1, aiming to fix #5628.

Since this if-watch PR, the system-configuration version has been updated, which enables compiling for iOS targets.

Notes & open questions

I'm not sure if I should update the changelogs to include the PR link?
Also, should the main libp2p version be bumped to 0.54.3?

I don't see 0.54.2 in crates, so I wasn't sure, but did it anyway to enable testing locally.

This change made possible compiling for aarch64-apple-ios-sim via cargo lipo and using the resulting static lib without XCode complaining about the deprecated interface.

Change checklist

  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • A changelog entry has been made in the appropriate crates

Copy link
Contributor

mergify bot commented Dec 23, 2024

This pull request has merge conflicts. Could you please resolve them @brenodt? 🙏

@brenodt brenodt force-pushed the deps/update-system-configuration branch from 377afdc to 47679a9 Compare December 23, 2024 21:53
@brenodt brenodt force-pushed the deps/update-system-configuration branch from 47679a9 to a2ac9f1 Compare December 23, 2024 21:55
Copy link
Contributor

@elenaf9 elenaf9 left a comment

Choose a reason for hiding this comment

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

Thanks @brenodt!

The version bumps of libp2p, libp2p-mdns and libp2p-quic aren't needed because in all of them the version has already been bumped since the last release.
Also, we usually don't do changelog entries when we update dependencies (correct me if I am wrong @jxs).

Copy link
Contributor

mergify bot commented Dec 24, 2024

This pull request has merge conflicts. Could you please resolve them @brenodt? 🙏

@brenodt brenodt force-pushed the deps/update-system-configuration branch from caea2bc to 528723d Compare December 26, 2024 17:13
@brenodt
Copy link
Contributor Author

brenodt commented Dec 26, 2024

Hi @elenaf9 , thanks for the review :)
Let me know if there's anything else I missed here.

Copy link
Member

@jxs jxs left a comment

Choose a reason for hiding this comment

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

Hi, and thanks for your PR! I don't think we even need a version bump right? As even the end user can update by doing cargo upgrade -p if-watch and it will update if-watch to 3.2.1

jxs
jxs previously approved these changes Jan 12, 2025
Copy link
Member

@jxs jxs left a comment

Choose a reason for hiding this comment

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

Thanks! Addressed the remaining issues

@jxs jxs added the send-it label Jan 12, 2025
Copy link
Contributor

mergify bot commented Jan 12, 2025

This pull request has been removed from the queue for the following reason: pull request branch update failed.

The pull request can't be updated

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

@mergify mergify bot dismissed jxs’s stale review January 12, 2025 20:27

Approvals have been dismissed because the PR was updated after the send-it label was applied.

@mergify mergify bot merged commit 1442ca0 into libp2p:master Jan 12, 2025
71 checks passed
mergify bot pushed a commit that referenced this pull request Jan 13, 2025
missed this, with this dependabot is not able to merge PR's by itself as it needs the `send-it` label.
also add a clause for the dismiss of stale approvals to not do so when the last commit was done by one of the `rust-libp2p` maintainers, so that we don't dismiss approvals if the last commit was a merge of master into the PR that is necessary before merging the PR.
Latest example of this happening [here](#5758 (comment))

Pull-Request: #5809.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Deprecated iOS interface in swift FFI bindings
3 participants