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

Companion for Substrate#9867 #3938

Merged
9 commits merged into from
Sep 29, 2021
Merged

Companion for Substrate#9867 #3938

9 commits merged into from
Sep 29, 2021

Conversation

liuchengxu
Copy link
Contributor

@ghost
Copy link

ghost commented Sep 29, 2021

Error: Companion update failed: Command 'Command { std: "cargo" "update" "-vp" "sp-io", kill_on_drop: false }' failed with status Some(101); output: Updating git repository https://github.com/paritytech/substrate
Updating crates.io index
error: failed to select a version for zstd-sys.
... required by package zstd-safe v3.0.0+zstd.1.4.8
... which is depended on by zstd v0.6.0+zstd.1.4.8
... which is depended on by polkadot-node-primitives v0.9.9 (/builds/polkadot/node/primitives)
... which is depended on by polkadot-approval-distribution v0.9.9 (/builds/polkadot/node/network/approval-distribution)
... which is depended on by polkadot-service v0.9.9 (/builds/polkadot/node/service)
... which is depended on by polkadot-cli v0.9.9 (/builds/polkadot/cli)
... which is depended on by polkadot v0.9.9 (/builds/polkadot)
versions that meet the requirements =1.4.19 are: 1.4.19+zstd.1.4.8

the package zstd-sys links to the native library zstd, but it conflicts with a previous package which links to zstd as well:
package zstd-sys v1.6.1+zstd.1.5.0
... which is depended on by zstd-safe v4.1.1+zstd.1.5.0
... which is depended on by zstd v0.9.0+zstd.1.5.0
... which is depended on by sp-maybe-compressed-blob v4.0.0-dev (https://github.com/paritytech/substrate?branch=master#4ecbb1f7)
... which is depended on by polkadot-node-collation-generation v0.9.9 (/builds/polkadot/node/collation-generation)
... which is depended on by polkadot-service v0.9.9 (/builds/polkadot/node/service)
... which is depended on by polkadot-cli v0.9.9 (/builds/polkadot/cli)
... which is depended on by polkadot v0.9.9 (/builds/polkadot)

failed to select a version for zstd-sys which could resolve this conflict

@andresilva
Copy link
Contributor

bot merge

@ghost
Copy link

ghost commented Sep 29, 2021

Waiting for commit status.

@ordian
Copy link
Member

ordian commented Sep 29, 2021

need to wait for #3834

@ordian ordian added A4-companion A PR that needs a companion PR to merge in parallel for one of its downstream dependencies. 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 Sep 29, 2021
@ghost
Copy link

ghost commented Sep 29, 2021

Merge aborted: Checks failed for 8ff8ed7

@andresilva
Copy link
Contributor

bot merge

@ghost
Copy link

ghost commented Sep 29, 2021

Waiting for commit status.

@ghost ghost merged commit 3338f9c into paritytech:master Sep 29, 2021
ordian added a commit that referenced this pull request Sep 29, 2021
* master:
  feat: measured oneshots (#3902)
  remove `AllSubsystems` and `AllSubsystemsGen` types (#3874)
  Companion for Substrate#9867 (#3938)
  Substrate Companion for #9552 (#3834)
  CI: run disputes tests (#3962)
  Bump parity-scale-codec from 2.3.0 to 2.3.1 (#3959)
  approval-voting: populate session cache in advance (#3954)
  Bump libc from 0.2.102 to 0.2.103 (#3950)
  fix master (#3955)
  Docker files chore (#3880)
  Bump nix from 0.19.1 to 0.20.0 (#3587)
  remove connected disconnected state, 3rd attempt (#3898)
  fix flaky chain-selection tests (#3948)
  Add benchmarking for parachain runtime initializer pallet (#3913)
  minor chore changes (#3944)
  disputes: reject single-sided disputes (#3903)
ordian added a commit that referenced this pull request Sep 30, 2021
* master: (52 commits)
  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)
  fix disputes tests (#3974)
  Drop availability only for candidates that lose disputes (#3973)
  revert +1 change to be on the safer side (#3972)
  paras_inherent: reject only candidates with concluded disputes (#3969)
  feat: measured oneshots (#3902)
  remove `AllSubsystems` and `AllSubsystemsGen` types (#3874)
  Companion for Substrate#9867 (#3938)
  Substrate Companion for #9552 (#3834)
  CI: run disputes tests (#3962)
  Bump parity-scale-codec from 2.3.0 to 2.3.1 (#3959)
  approval-voting: populate session cache in advance (#3954)
  Bump libc from 0.2.102 to 0.2.103 (#3950)
  fix master (#3955)
  Docker files chore (#3880)
  Bump nix from 0.19.1 to 0.20.0 (#3587)
  remove connected disconnected state, 3rd attempt (#3898)
  ...
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A4-companion A PR that needs a companion PR to merge in parallel for one of its downstream dependencies. 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
Development

Successfully merging this pull request may close these issues.

4 participants