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

upgrade to polkadot v1.0.0 #339

Merged
merged 14 commits into from
Jul 31, 2023
Merged

upgrade to polkadot v1.0.0 #339

merged 14 commits into from
Jul 31, 2023

Conversation

brenzi
Copy link
Member

@brenzi brenzi commented Jul 22, 2023

integrates encointer/pallets#332

CI

  • srtool builds with stable now

@brenzi
Copy link
Member Author

brenzi commented Jul 23, 2023

annoying:
the trait bound encointer_primitives::scheduler::CeremonyPhaseType: Serialize is not satisfied

seems we lose the std feature somewhere along the way, but all tomls checked

@clangenb
Copy link
Member

clangenb commented Jul 23, 2023

Serde error is fixed by updating to the newest encointer-pallet's commit, but the build is now stuck in the client because the api-client is still on v0.9.42: scs/substrate-api-client#625

@brenzi brenzi marked this pull request as ready for review July 29, 2023 10:10
@brenzi brenzi requested a review from clangenb July 29, 2023 10:11
@brenzi
Copy link
Member Author

brenzi commented Jul 30, 2023

seems like srtool needs an upgrade to a newer rustc

@@ -122,7 +122,7 @@ jobs:
image: paritytech/srtool
chain: ${{ matrix.runtime }}
# Can remove that when we can build with stable, see: https://github.com/integritee-network/parachain/issues/200
tag: 1.66.1
tag: 1.71.0
Copy link
Member

Choose a reason for hiding this comment

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

This is here for the following reason: By default the newest srtool image is taken. However all images after 1.66.1 only have the stable toolchain installed, which fails as long as we have the nightly in our rust-toolchain.toml.

It was substrate that prevented the change to a stable rust-toolchain if I remember correctly, so we can just try switching the toolchain to some stable version, and maybe it works.

Copy link
Member Author

Choose a reason for hiding this comment

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

it does. thx

Copy link
Member

@clangenb clangenb left a comment

Choose a reason for hiding this comment

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

Oh nice, the number of changes was turned out to be not so big after all. :)

Approving, and you can merge once you mage the CI pass. Exchanging nightly- with stable- in the rust-toolchain.toml should fix the issue.

node/src/chain_spec.rs Outdated Show resolved Hide resolved
@brenzi brenzi merged commit d5756a9 into master Jul 31, 2023
3 of 8 checks passed
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2023-01-13"
channel = "nightly-2023-05-22"
Copy link
Member

Choose a reason for hiding this comment

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

I am actually surprised that it works. Earlier srtool images returned an error because it only has the stable toolchain installed, which conflicted with the one here. Don't know what changed on their end.

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