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

Backport from polkadot-sdk with actual master #2633

Merged
merged 13 commits into from
Oct 19, 2023

Conversation

bkontur
Copy link
Contributor

@bkontur bkontur commented Oct 18, 2023

No description provided.

@@ -47,7 +47,7 @@ polkadot-node-core-pvf-execute-worker = { git = "https://github.com/paritytech/p
polkadot-node-core-pvf-prepare-worker = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false, features = [ "full-node", "polkadot-native" ] }
polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false, features = [ "full-node", "westend-native" ] }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@svyatonik polkadot-runtime is removed from polkadot-sdk, changed it to westend-runtime and lets see if it works. Do we need to change anything else polkadot->westend related for rialto?

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think we need any runtime for that - the reason it is here (iirc) is because polkadot-service required at least one of *-runtime features to compile. If it does compile without it, we could remove this feature at all

Copy link
Contributor Author

Choose a reason for hiding this comment

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

looks like without any runtime it causes this error: https://gitlab.parity.io/parity/mirrors/parity-bridges-common/-/jobs/4006286,
I will leave westend-runtime

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok, missing runtime feaure is not a problem, we need to fix probably feature flags propagation:

~/parity/parity-bridges-common$ zepter lint propagate-feature --feature runtime-benchmarks --left-side-feature-missing=ignore --workspace --feature-enables-dep="runtime-benchmarks:frame-benchmarking" --locked
crate 'millau-runtime'
  feature 'runtime-benchmarks'
    must propagate to:
      pallet-bridge-grandpa
crate 'rialto-parachain-runtime'
  feature 'runtime-benchmarks'
    must propagate to:
      bridge-runtime-common
      pallet-bridge-grandpa
      pallet-bridge-messages
      pallet-bridge-relayers
crate 'rialto-runtime'
  feature 'runtime-benchmarks'
    must propagate to:
      pallet-bridge-grandpa
      pallet-bridge-relayers
Found 7 issues (run with --fix to fix).

continue tomorrow, if this will work, maybe zepter will work in our CI also

@bkontur bkontur requested a review from a team as a code owner October 18, 2023 20:43
@bkontur bkontur merged commit 1d78aa1 into polkadot-staging Oct 19, 2023
@bkontur bkontur deleted the bko-polkadot-staging branch October 19, 2023 08:04
bkontur added a commit that referenced this pull request Oct 19, 2023
* Backport from `polkadot-sdk`

* lingua stuff

* Fixes

* Fix

* Features?

* Fix - v5 -> v6

* zepter format features

* try zepter with CI

* Fix imports

* Fix

* Fix

* Fix

* Revert zepther pipeline
bkontur added a commit that referenced this pull request Oct 19, 2023
* Backport from `polkadot-sdk`

* lingua stuff

* Fixes

* Fix

* Features?

* Fix - v5 -> v6

* zepter format features

* try zepter with CI

* Fix imports

* Fix

* Fix

* Fix

* Revert zepther pipeline
serban300 pushed a commit to serban300/parity-bridges-common that referenced this pull request Mar 27, 2024
* Backport from `polkadot-sdk`

* lingua stuff

* Fixes

* Fix

* Features?

* Fix - v5 -> v6

* zepter format features

* try zepter with CI

* Fix imports

* Fix

* Fix

* Fix

* Revert zepther pipeline
serban300 pushed a commit to serban300/parity-bridges-common that referenced this pull request Apr 8, 2024
* Backport from `polkadot-sdk`

* lingua stuff

* Fixes

* Fix

* Features?

* Fix - v5 -> v6

* zepter format features

* try zepter with CI

* Fix imports

* Fix

* Fix

* Fix

* Revert zepther pipeline
bkontur added a commit that referenced this pull request May 7, 2024
* Backport from `polkadot-sdk`

* lingua stuff

* Fixes

* Fix

* Features?

* Fix - v5 -> v6

* zepter format features

* try zepter with CI

* Fix imports

* Fix

* Fix

* Fix

* Revert zepther pipeline
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