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

fix: patch yanked funty@1.2.0 with git commit #2210

Merged
merged 5 commits into from
Nov 16, 2022

Conversation

hanabi1224
Copy link
Contributor

Summary of changes
Changes introduced in this pull request:

  • fix cargo update command by patching yanked funty@1.2.0

We currently get below errors when running cargo update, which blocks PRs that have conflicts in Cargo.lock

forest git:(main) cargo update
    Updating crates.io index
    Updating git repository `https://github.com/filecoin-project/builtin-actors`
    Updating git repository `https://github.com/filecoin-project/builtin-actors`
    Updating git repository `https://github.com/ChainSafe/libp2p-bitswap`
error: failed to select a version for the requirement `funty = "~1.2"`
candidate versions found which didn't match: 2.0.0, 1.1.0, 1.0.1, ...
location searched: crates.io index
required by package `bitvec v0.22.3`
    ... which satisfies dependency `bitvec = "^0.22.3"` of package `ec-gpu-gen v0.3.0`
    ... which satisfies dependency `ec-gpu-gen = "^0.3.0"` of package `bellperson v0.22.0`
    ... which satisfies dependency `bellperson = "^0.22.0"` of package `filecoin-hashers v7.0.0`
    ... which satisfies dependency `filecoin-hashers = "~7.0.0"` of package `filecoin-proofs v12.0.0`
    ... which satisfies dependency `filecoin-proofs-v1 = "~12.0.0"` of package `filecoin-proofs-api v12.0.0`
    ... which satisfies dependency `filecoin-proofs-api = "^12.0"` of package `forest_fil_types v0.4.0 (/home/me/git/hanabi1224/forest/types)`
    ... which satisfies path dependency `forest_fil_types` of package `forest-cli v0.4.1 (/home/me/git/hanabi1224/forest/forest/cli)`

Reference issue to close (if applicable)

Closes

Other information and links

@lemmih
Copy link
Contributor

lemmih commented Nov 16, 2022

Related issue: ferrilab/funty#7

@@ -40,6 +40,10 @@ members = [
]
resolver = "2"

[patch.crates-io]
# temporary solution to funty@1.2.0 being yanked, we should propose bitvec upgrade to upstream filecoin crates
funty = { git = "https://github.com/bitvecto-rs/funty/", rev = "7ef0d890fbcd8b3def1635ac1a877fc298488446" }
Copy link
Contributor

Choose a reason for hiding this comment

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

would be good to add: tracking issue: https://github.com/bitvecto-rs/funty/issues/7 here for future

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@lemmih lemmih merged commit 0fa765d into ChainSafe:main Nov 16, 2022
@hanabi1224 hanabi1224 deleted the patch-funty branch November 16, 2022 13:05
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.

3 participants