[pull] master from paritytech:master #305
Merged
+11
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bump pallet-staking-reward-fn to patch. This forces it to use local path and the local sp-arithmetic instead of registry while running `parity-publish`. This aims to fix the failure in `Check publish build` job (e.g. https://github.com/paritytech/polkadot-sdk/actions/runs/21359458014/job/61474963706?pr=10903#step:12:546) which started to appear since #10682 got merged. When parity-publish is used with --registry: - If the version exists on crates.io → remove path, use registry - If the version doesn't exist → keep path, use local The issue is that --registry creates a hybrid state where some deps use registry and some use local paths, causing version conflicts in case e.g of missing trait impl in on the two. Extended explanation, courtesy of @iulianbarbu : In the parity-publish CI job example we have: - polkadot-runtime-common (crate A), depends on crate B indirectly & crate C - sp-arithmetic (crate B), was bumped locally (due to #10682), but not published on the registry yet - pallet-staking-reward-fn (crate C). depends on crate B. polkadot-runtime-common fails to compile due to a dependency graph using two versions of same type of crate B. What is an issue though is that pallet-staking-reward-fn uses the previous crate B version (from the registry), which misses a certain trait impl that is required by polkadot-runtime-common. If polkadot-runtime-common usage of pallet-staking-reward-fn expects the new trait impl, it means that it is not enough to just bump pallet-staking-reward-fn, but also polkadot-runtime-common, in this PR (to update it to depend on the new version of pallet-staking-reward-fn). Everything compiles fine rn because polkadot-runtime-common is already bumped in a previous PR (e.g #10582 and maybe others), which did not make its way to a stable release yet.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )