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

Pull all dependencies to the workspace #314

Merged
merged 20 commits into from
May 18, 2024
Merged

Conversation

ggwpez
Copy link
Member

@ggwpez ggwpez commented May 17, 2024

Changes:

  • Pull all dependencies to the workspace and add a CI check.
  • Fixup the crates that had differing dependency aliases.
  • Add CI check to keep deps in the workspace
  • Add Taplo config for TOML formatting (follow up: add CI check)

This is a preliminary to updating to the new SDK version as we currently use conflicting aliases for a few packages while packages are not able to rename workspace deps, see rust-lang/cargo#12546

This is a No-OP change, as can be verified with this:

git checkout oty-fix-dependencies
cargo tree -e features > oty.tree

git checkout origin/main
cargo tree -e features > main.tree

diff main.tree oty.tree
  • Does not require a CHANGELOG entry

ggwpez added 19 commits May 17, 2024 17:56
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
zepter transpose dep lift-to-workspace 'regex:.*' --fix

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Copy link
Contributor

@bkchr bkchr left a comment

Choose a reason for hiding this comment

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

Ty!

@github-actions github-actions bot requested a review from bkchr May 17, 2024 18:48
Copy link

Review required! Latest push from author must always be reviewed

], workspace = true }
cumulus-pallet-xcm = { workspace = true }
cumulus-pallet-xcmp-queue = { workspace = true }
cumulus-primitives-aura = { workspace = true }
cumulus-primitives-core = { workspace = true }
cumulus-primitives-utility = { workspace = true }
parachain-info = { package = "staging-parachain-info", default-features = false, version = "0.8.0" }
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the workspace dependencies feature is cool. The potential problem I see is with Encointer and its pallets, which use a different version of the Polkadot SDK. When we upgrade to a new version of the Polkadot SDK, Encointer is unlikely to compile. As a result, we won't be able to create a new release unless Encointer updates its pallets to the same Polkadot SDK version.

Therefore, it's questionable whether using workspace dependencies is a good idea for Encointer at this time. But let's give it a try and see what happens.

Copy link
Member Author

Choose a reason for hiding this comment

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

Okay i did not think about this. It basically means that we need to update the encointer pallets in advance to the version of the SDK that we plan to use next.

.cargo/config.toml Outdated Show resolved Hide resolved
.cargo/config.toml Outdated Show resolved Hide resolved
.cargo/config.toml Outdated Show resolved Hide resolved
Co-authored-by: ordian <noreply@reusable.software>
@ggwpez
Copy link
Member Author

ggwpez commented May 18, 2024

/merge

@fellowship-merge-bot fellowship-merge-bot bot merged commit 03d2571 into main May 18, 2024
38 of 39 checks passed
@fellowship-merge-bot
Copy link
Contributor

Enabled auto-merge in Pull Request

Available commands
  • /merge: Enables auto-merge for Pull Request
  • /merge cancel: Cancels auto-merge for Pull Request
  • /merge help: Shows this menu

For more information see the documentation

@ggwpez ggwpez deleted the oty-fix-dependencies branch May 18, 2024 10:56
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.

6 participants