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

Update all references in Cargo.lock for patched crates #89

Merged
merged 3 commits into from
Dec 5, 2022

Conversation

joao-paulo-parity
Copy link
Contributor

@joao-paulo-parity joao-paulo-parity commented Dec 5, 2022

Works around https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2115137#L1544

Comparing https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2115137#L1544, which failed to compile polkadot-node-subsystem-test-helpers with errors such as

error[E0053]: method `authority_set_proof` has an incompatible type for trait
    --> /builds/parity/mirrors/substrate/extra_dependencies/polkadot/runtime/rococo/src/lib.rs:1882:31
     |
1882 |         fn authority_set_proof() -> beefy_primitives::mmr::BeefyAuthoritySet<Hash> {
     |                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |                                     |
     |                                     expected struct `sp_beefy::mmr::BeefyAuthoritySet`, found struct `BeefyAuthoritySet`
     |                                     help: change the output type to match the trait: `sp_beefy::mmr::BeefyAuthoritySet<H256>`
     |
     = note: expected fn pointer `fn() -> sp_beefy::mmr::BeefyAuthoritySet<H256>`
                found fn pointer `fn() -> BeefyAuthoritySet<H256>`

with https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2116743#L1811, which got past that point, I think that the fix is effective.

ref paritytech/substrate#12837 (comment)

@joao-paulo-parity joao-paulo-parity requested a review from a team as a code owner December 5, 2022 09:58
@joao-paulo-parity joao-paulo-parity requested a review from a team December 5, 2022 09:58
sort |
uniq
)
cargo update "${comp_update_args[@]}"
Copy link
Contributor

Choose a reason for hiding this comment

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

won't it conflict with --locked flag?
#88

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, because cargo check is being executed without the --locked flag below, as intended: Cargo.lock will invariably need to be updated because we're patching packages into projects

@joao-paulo-parity
Copy link
Contributor Author

joao-paulo-parity commented Dec 5, 2022

I think this bug fix might have uncovered more issues in the integration check. Moving it to Draft in the meantime.

It's working as per https://gitlab.parity.io/parity/mirrors/substrate/builds/2117207 and https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2117249

@joao-paulo-parity joao-paulo-parity merged commit 20002c7 into paritytech:master Dec 5, 2022
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.

2 participants