Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Bump async-std's version to remove conflict on Substrate for Cumulus #3981

Merged
merged 1 commit into from
Oct 1, 2021
Merged

Bump async-std's version to remove conflict on Substrate for Cumulus #3981

merged 1 commit into from
Oct 1, 2021

Conversation

joao-paulo-parity
Copy link
Contributor

The mismatch happens in Cumulus when ran in the dependent checks: https://gitlab.parity.io/parity/substrate/-/jobs/1151852#L376

error: failed to select a version for `async-std`.
    ... required by package `polkadot-node-core-pvf v0.9.9 (https://github.com/paritytech/polkadot?branch=master#cedd601b)`
    ... which is depended on by `cumulus-test-relay-validation-worker-provider v0.1.0 (/builds/parity/substrate/cumulus/test/relay-validation-worker-provider)`
    ... which is depended on by `cumulus-test-service v0.1.0 (/builds/parity/substrate/cumulus/test/service)`
    ... which is depended on by `cumulus-client-network v0.1.0 (/builds/parity/substrate/cumulus/client/network)`
    ... which is depended on by `cumulus-client-collator v0.1.0 (/builds/parity/substrate/cumulus/client/collator)`
    ... which is depended on by `cumulus-client-service v0.1.0 (/builds/parity/substrate/cumulus/client/service)`
    ... which is depended on by `parachain-template-node v0.1.0 (/builds/parity/substrate/cumulus/parachain-template/node)`
versions that meet the requirements `=1.9.0` are: 1.9.0
all possible versions conflict with previously selected packages.
  previously selected package `async-std v1.10.0`
    ... which is depended on by `sc-network v0.10.0-dev (/builds/parity/substrate/client/network)`
    ... which is depended on by `cumulus-test-service v0.1.0 (/builds/parity/substrate/cumulus/test/service)`
    ... which is depended on by `cumulus-client-network v0.1.0 (/builds/parity/substrate/cumulus/client/network)`
    ... which is depended on by `cumulus-client-collator v0.1.0 (/builds/parity/substrate/cumulus/client/collator)`
    ... which is depended on by `cumulus-client-service v0.1.0 (/builds/parity/substrate/cumulus/client/service)`
    ... which is depended on by `parachain-template-node v0.1.0 (/builds/parity/substrate/cumulus/parachain-template/node)`
failed to select a version for `async-std` which could resolve this conflict

According to git blame async-std was bumped to 1.10.0 in Sep 29 and polkadot-node-core-pvf is already pointing to Polkadot master so I believe the conflict has to be resolved manually.

There are more occurrences of async-std with varying versions, e.g. 1.9.0 and 1.6.5, throughout the project, but I'm not updating all of them since I don't know if it is necessary.

@joao-paulo-parity joao-paulo-parity added A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update). B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. labels Oct 1, 2021
@joao-paulo-parity
Copy link
Contributor Author

Copied the tags from previous bump PRs

This was referenced Oct 1, 2021
Closed
Merged
@bkchr bkchr merged commit f588fe6 into master Oct 1, 2021
@bkchr bkchr deleted the jp/async-std branch October 1, 2021 08:22
ordian added a commit to Lldenaurois/polkadot that referenced this pull request Oct 2, 2021
@ordian
Merge branch 'master' into ladi-logging-disputes
dade923 
* master:
  preserve finalized block in active leaves (paritytech#3997)
  some tweaks to rococo-local (paritytech#3996)
  always broadcast tranche 0 assignments and add a delay before approval (paritytech#3904)
  Tidy up XCM errors in preparation for v2. (paritytech#3988)
  add disputes call to Rococo (paritytech#3993)
  Fix an off-by-one: revert rather than revert-to (paritytech#3991)
  add logs to relay chain selection (paritytech#3990)
  av-store: clean up StoreAvailableData message (paritytech#3984)
  add polkadot-simnet runner (paritytech#3985)
  Remove incorrect proof about Jemalloc (paritytech#3982)
  add new rococo chainspec (paritytech#3976)
  bump async-std's version to remove conflict for substrate (paritytech#3981)
  gossip-support: set last_session_index earlier (paritytech#3978)
ordian added a commit that referenced this pull request Oct 3, 2021
@ordian
Merge branch 'master' into bernhard-malus-fx
e0f8223 
* master: (72 commits)
  change genesis authority set for wococo-local, revert rococo-local (#3998)
  ignore irrelevant approvals in logs (#3859)
  avoid expect, on free availability core (#3994)
  preserve finalized block in active leaves (#3997)
  some tweaks to rococo-local (#3996)
  always broadcast tranche 0 assignments and add a delay before approval (#3904)
  Tidy up XCM errors in preparation for v2. (#3988)
  add disputes call to Rococo (#3993)
  Fix an off-by-one: revert rather than revert-to (#3991)
  add logs to relay chain selection (#3990)
  av-store: clean up StoreAvailableData message (#3984)
  add polkadot-simnet runner (#3985)
  Remove incorrect proof about Jemalloc (#3982)
  add new rococo chainspec (#3976)
  bump async-std's version to remove conflict for substrate (#3981)
  gossip-support: set last_session_index earlier (#3978)
  Companion for substrate PR#9890 (#3961)
  Bump version, tx_version and spec_version in prep for v0.9.11 (#3970)
  Fix master compilation (#3977)
  Make most XCM APIs accept an Into<MultiLocation> where MultiLocation is accepted (#3627)
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@bkchr bkchr bkchr approved these changes

@shawntabrizi shawntabrizi shawntabrizi approved these changes

Assignees
No one assigned
Labels
A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update). B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@joao-paulo-parity @shawntabrizi @bkchr